Skip to content

Commit

Permalink
chrome: Move BrowserListObserver files out of chrome namespace.
Browse files Browse the repository at this point in the history
From discussion on chromium-dev, it was decided to remove 'chrome'
namespace.
See the discussion about this that has happened in
https://groups.google.com/a/chromium.org/d/topic/chromium-dev/pcgYLSJsii8/discussion

TBR=sky@chromium.org

Bug: 289619
Change-Id: Ic03e825bf2a65ec1edff0bd2c9e36b2a8c24c39b
Reviewed-on: https://chromium-review.googlesource.com/821831
Commit-Queue: Chandramouli Sanchi <cm.sanchi@samsung.com>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523692}
  • Loading branch information
cmsanchi-srib authored and Commit Bot committed Dec 13, 2017
1 parent 537399f commit a0d6add
Show file tree
Hide file tree
Showing 54 changed files with 114 additions and 123 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void OnShimQuit(Host* host) override {}
};

// Watches for a hosted app browser window to open.
class HostedAppBrowserListObserver : public chrome::BrowserListObserver {
class HostedAppBrowserListObserver : public BrowserListObserver {
public:
explicit HostedAppBrowserListObserver(const std::string& app_id)
: app_id_(app_id), observed_add_(false), observed_removed_(false) {
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace apps {
class ExtensionAppShimHandler : public AppShimHandler,
public content::NotificationObserver,
public AppLifetimeMonitor::Observer,
public chrome::BrowserListObserver {
public BrowserListObserver {
public:
class Delegate {
public:
Expand Down Expand Up @@ -143,7 +143,7 @@ class ExtensionAppShimHandler : public AppShimHandler,
const content::NotificationSource& source,
const content::NotificationDetails& details) override;

// chrome::BrowserListObserver overrides;
// BrowserListObserver overrides;
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;

Expand Down
13 changes: 6 additions & 7 deletions chrome/browser/background/background_mode_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,11 @@ typedef std::vector<base::Closure> CommandIdHandlerVector;
// Additionally, when in background mode, Chrome will launch on OS login with
// no open windows to allow apps with the "background" permission to run in the
// background.
class BackgroundModeManager
: public content::NotificationObserver,
public chrome::BrowserListObserver,
public BackgroundApplicationListModel::Observer,
public ProfileAttributesStorage::Observer,
public StatusIconMenuModel::Delegate {
class BackgroundModeManager : public content::NotificationObserver,
public BrowserListObserver,
public BackgroundApplicationListModel::Observer,
public ProfileAttributesStorage::Observer,
public StatusIconMenuModel::Delegate {
public:
BackgroundModeManager(const base::CommandLine& command_line,
ProfileAttributesStorage* profile_storage);
Expand Down Expand Up @@ -297,7 +296,7 @@ class BackgroundModeManager
// Overrides from StatusIconMenuModel::Delegate implementation.
void ExecuteCommand(int command_id, int event_flags) override;

// chrome::BrowserListObserver implementation.
// BrowserListObserver implementation.
void OnBrowserAdded(Browser* browser) override;

// Enables or disables background mode as needed, taking into account the
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/background/background_mode_optimizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Browser;
// It tries to restart the browser to release accumulated memory when it
// is considered non distruptive.
class BackgroundModeOptimizer : public KeepAliveStateObserver,
chrome::BrowserListObserver {
BrowserListObserver {
public:
~BackgroundModeOptimizer() override;

Expand All @@ -31,7 +31,7 @@ class BackgroundModeOptimizer : public KeepAliveStateObserver,
void OnKeepAliveStateChanged(bool is_keeping_alive) override;
void OnKeepAliveRestartStateChanged(bool can_restart) override;

// chrome::BrowserListObserver implementation.
// BrowserListObserver implementation.
void OnBrowserAdded(Browser* browser) override;

private:
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/browser_shutdown_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class BrowserShutdownBrowserTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(BrowserShutdownBrowserTest);
};

class BrowserClosingObserver : public chrome::BrowserListObserver {
class BrowserClosingObserver : public BrowserListObserver {
public:
BrowserClosingObserver() {}
MOCK_METHOD1(OnBrowserClosing, void(Browser* browser));
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/chromeos/app_mode/app_session.cc
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class AppSession::AppWindowHandler : public AppWindowRegistry::Observer {
DISALLOW_COPY_AND_ASSIGN(AppWindowHandler);
};

class AppSession::BrowserWindowHandler : public chrome::BrowserListObserver {
class AppSession::BrowserWindowHandler : public BrowserListObserver {
public:
BrowserWindowHandler() {
BrowserList::AddObserver(this);
Expand All @@ -172,7 +172,7 @@ class AppSession::BrowserWindowHandler : public chrome::BrowserListObserver {
browser->window()->Close();
}

// chrome::BrowserListObserver overrides:
// BrowserListObserver overrides:
void OnBrowserAdded(Browser* browser) override {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/chromeos/first_run/goodies_displayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct GoodiesDisplayerTestInfo;

// Handles display of OOBE Goodies page on first display of browser window on
// new Chromebooks.
class GoodiesDisplayer : public chrome::BrowserListObserver {
class GoodiesDisplayer : public BrowserListObserver {
public:
// ChromeOS Goodies page for new Chromebook promos.
static const char kGoodiesURL[];
Expand All @@ -32,7 +32,7 @@ class GoodiesDisplayer : public chrome::BrowserListObserver {
static void Delete();

private:
// Overridden from chrome::BrowserListObserver.
// Overridden from BrowserListObserver.
void OnBrowserSetLastActive(Browser* browser) override;

DISALLOW_COPY_AND_ASSIGN(GoodiesDisplayer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ void PolicyChangedCallback(const base::Closure& callback,

class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
public user_manager::UserManager::Observer,
public chrome::BrowserListObserver,
public BrowserListObserver,
public extensions::AppWindowRegistry::Observer {
protected:
DeviceLocalAccountTest()
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/extensions/api/tabs/tabs_event_router.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace extensions {
// extension processes in the same profile.
class TabsEventRouter : public TabStripModelObserver,
public BrowserTabStripTrackerDelegate,
public chrome::BrowserListObserver,
public BrowserListObserver,
public favicon::FaviconDriverObserver,
public zoom::ZoomObserver,
public resource_coordinator::TabLifecycleObserver {
Expand All @@ -50,7 +50,7 @@ class TabsEventRouter : public TabStripModelObserver,
// BrowserTabStripTrackerDelegate:
bool ShouldTrackBrowser(Browser* browser) override;

// chrome::BrowserListObserver:
// BrowserListObserver:
void OnBrowserSetLastActive(Browser* browser) override;

// TabStripModelObserver:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace extensions {

class ExtensionRegistry;

class ExtensionMessageBubbleController : public chrome::BrowserListObserver,
class ExtensionMessageBubbleController : public BrowserListObserver,
public ExtensionRegistryObserver {
public:
// UMA histogram constants.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace metrics {

// BrowserList / TabStripModelObserver used for tracking audio status.
class AudibleContentsTracker : public chrome::BrowserListObserver,
class AudibleContentsTracker : public BrowserListObserver,
public TabStripModelObserver {
public:
// Interface for an observer of the AudibleContentsTracker. The only client
Expand Down Expand Up @@ -42,7 +42,7 @@ class AudibleContentsTracker : public chrome::BrowserListObserver,
~AudibleContentsTracker() override;

private:
// chrome::BrowserListObserver:
// BrowserListObserver:
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace metrics {
// Observer for tracking browser visibility events.
class ChromeVisibilityObserver : public chrome::BrowserListObserver {
class ChromeVisibilityObserver : public BrowserListObserver {
public:
ChromeVisibilityObserver();
~ChromeVisibilityObserver() override;
Expand All @@ -26,7 +26,7 @@ class ChromeVisibilityObserver : public chrome::BrowserListObserver {
// short gap.
void CancelVisibilityChange();

// chrome::BrowserListObserver:
// BrowserListObserver:
void OnBrowserSetLastActive(Browser* browser) override;
void OnBrowserNoLongerActive(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/metrics/perf/windowed_incognito_observer.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace metrics {

// This class watches for any incognito window being opened from the time it is
// instantiated to the time it is destroyed.
class WindowedIncognitoObserver : public chrome::BrowserListObserver {
class WindowedIncognitoObserver : public BrowserListObserver {
public:
WindowedIncognitoObserver();
~WindowedIncognitoObserver() override;
Expand All @@ -32,7 +32,7 @@ class WindowedIncognitoObserver : public chrome::BrowserListObserver {
}

private:
// chrome::BrowserListObserver implementation.
// BrowserListObserver implementation.
void OnBrowserAdded(Browser* browser) override;

// Gets set if an incognito window was opened during the lifetime of the
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/metrics/tab_stats_tracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace metrics {
// TabStatsTracker::SetInstance(
// std::make_unique<TabStatsTracker>(g_browser_process->local_state()));
class TabStatsTracker : public TabStripModelObserver,
public chrome::BrowserListObserver,
public BrowserListObserver,
public base::PowerObserver {
public:
// Constructor. |pref_service| must outlive this object.
Expand Down Expand Up @@ -96,7 +96,7 @@ class TabStatsTracker : public TabStripModelObserver,
daily_event_.reset(daily_event);
}

// chrome::BrowserListObserver:
// BrowserListObserver:
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;

Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/profiles/profile_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,12 @@ class ProfileManager : public content::NotificationObserver,
// See kLastActiveUser in UserManagerBase.
void UpdateLastUser(Profile* last_active);

class BrowserListObserver : public chrome::BrowserListObserver {
class BrowserListObserver : public ::BrowserListObserver {
public:
explicit BrowserListObserver(ProfileManager* manager);
~BrowserListObserver() override;

// chrome::BrowserListObserver implementation.
// ::BrowserListObserver implementation.
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;
void OnBrowserSetLastActive(Browser* browser) override;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profiles/profile_window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void UnblockExtensions(Profile* profile) {

// Handles running a callback when a new Browser for the given profile
// has been completely created.
class BrowserAddedForProfileObserver : public chrome::BrowserListObserver {
class BrowserAddedForProfileObserver : public BrowserListObserver {
public:
BrowserAddedForProfileObserver(
Profile* profile,
Expand Down
3 changes: 1 addition & 2 deletions chrome/browser/resource_coordinator/tab_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ struct BrowserInfo {
// Tabs are identified by a unique ID vended by this component. These IDs are
// not reused in a session. They are stable for a given conceptual tab, and will
// follow it through discards, reloads, tab strip operations, etc.
class TabManager : public TabStripModelObserver,
public chrome::BrowserListObserver {
class TabManager : public TabStripModelObserver, public BrowserListObserver {
public:
// Forward declaration of resource coordinator signal observer.
class ResourceCoordinatorSignalObserver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ enum class ProcessType {
// renderers' scores up to date in /proc/<pid>/oom_score_adj.
class TabManagerDelegate : public wm::ActivationChangeObserver,
public content::NotificationObserver,
public chrome::BrowserListObserver {
public BrowserListObserver {
public:
class MemoryStat;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ChromeCleanerPromptDelegate {
class ChromeCleanerDialogControllerImpl
: public ChromeCleanerDialogController,
public ChromeCleanerController::Observer,
public chrome::BrowserListObserver {
public BrowserListObserver {
public:
// An instance should only be created when |cleaner_controller| is in the
// kScanning state.
Expand All @@ -55,7 +55,7 @@ class ChromeCleanerDialogControllerImpl
void OnCleaning(const ChromeCleanerScannerResults& reported_results) override;
void OnRebootRequired() override;

// chrome::BrowserListObserver overrides.
// BrowserListObserver overrides.
void OnBrowserSetLastActive(Browser* browser) override;

// Test specific methods.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace safe_browsing {

class ChromeCleanerRebootDialogControllerImpl
: public ChromeCleanerRebootDialogController,
public chrome::BrowserListObserver {
public BrowserListObserver {
public:
class PromptDelegate {
public:
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/sessions/session_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct SessionWindow;
// browser.
class SessionService : public sessions::BaseSessionServiceDelegate,
public KeyedService,
public chrome::BrowserListObserver {
public BrowserListObserver {
friend class SessionServiceTestHelper;
public:
// Used to distinguish an application from a ordinary content window.
Expand Down Expand Up @@ -244,7 +244,7 @@ class SessionService : public sessions::BaseSessionServiceDelegate,
bool RestoreIfNecessary(const std::vector<GURL>& urls_to_open,
Browser* browser);

// chrome::BrowserListObserver
// BrowserListObserver
void OnBrowserAdded(Browser* browser) override {}
void OnBrowserRemoved(Browser* browser) override {}
void OnBrowserSetLastActive(Browser* browser) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class ChromeSigninStatusMetricsProviderDelegate
: public SigninStatusMetricsProviderDelegate,
public chrome::BrowserListObserver,
public BrowserListObserver,
public SigninManagerFactory::Observer {
public:
ChromeSigninStatusMetricsProviderDelegate();
Expand All @@ -28,7 +28,7 @@ class ChromeSigninStatusMetricsProviderDelegate
AccountsStatus GetStatusOfAllAccounts() override;
std::vector<SigninManager*> GetSigninManagersForAllAccounts() override;

// chrome::BrowserListObserver:
// BrowserListObserver:
void OnBrowserAdded(Browser* browser) override;

// SigninManagerFactoryObserver:
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/supervised_user/supervised_user_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class SupervisedUserService : public KeyedService,
public syncer::SyncTypePreferenceProvider,
#if !defined(OS_ANDROID)
public syncer::SyncServiceObserver,
public chrome::BrowserListObserver,
public BrowserListObserver,
#endif
public SupervisedUserURLFilter::Observer {
public:
Expand Down Expand Up @@ -213,7 +213,7 @@ class SupervisedUserService : public KeyedService,
// syncer::SyncServiceObserver implementation:
void OnStateChanged(syncer::SyncService* sync) override;

// chrome::BrowserListObserver implementation:
// BrowserListObserver implementation:
void OnBrowserSetLastActive(Browser* browser) override;
#endif // !defined(OS_ANDROID)

Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/sync/sessions/browser_list_router_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ namespace sync_sessions {
// multi-window scenarios(e.g. tab movement between windows). Android doesn't
// have a BrowserList or TabStrip, so it doesn't compile the needed
// dependencies, nor would it benefit from the added tracking.
class BrowserListRouterHelper : public chrome::BrowserListObserver,
class BrowserListRouterHelper : public BrowserListObserver,
public TabStripModelObserver {
public:
explicit BrowserListRouterHelper(SyncSessionsWebContentsRouter* router,
Profile* profile);
~BrowserListRouterHelper() override;

private:
// chrome::BrowserListObserver implementation.
// BrowserListObserver implementation.
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;
// TabStripModelObserver implementation.
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/tracing/chrome_tracing_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class PrefRegistrySimple;

class ChromeTracingDelegate : public content::TracingDelegate,
public chrome::BrowserListObserver {
public BrowserListObserver {
public:
ChromeTracingDelegate();
~ChromeTracingDelegate() override;
Expand All @@ -38,7 +38,7 @@ class ChromeTracingDelegate : public content::TracingDelegate,
content::MetadataFilterPredicate GetMetadataFilterPredicate() override;

private:
// chrome::BrowserListObserver implementation.
// BrowserListObserver implementation.
void OnBrowserAdded(Browser* browser) override;

bool incognito_launched_;
Expand Down
Loading

0 comments on commit a0d6add

Please sign in to comment.