diff options
Diffstat (limited to 'chrome/browser/automation/automation_provider_observers.h')
-rw-r--r-- | chrome/browser/automation/automation_provider_observers.h | 358 |
1 files changed, 183 insertions, 175 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index 5eed00a..66ba758 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -49,8 +49,8 @@ #include "content/browser/cancelable_request.h" #include "content/browser/download/download_item.h" #include "content/browser/download/download_manager.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" #include "ui/gfx/size.h" @@ -84,14 +84,14 @@ namespace IPC { class Message; } -class InitialLoadObserver : public NotificationObserver { +class InitialLoadObserver : public content::NotificationObserver { public: InitialLoadObserver(size_t tab_count, AutomationProvider* automation); virtual ~InitialLoadObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Caller owns the return value and is responsible for deleting it. // Example return value: @@ -109,7 +109,7 @@ class InitialLoadObserver : public NotificationObserver { void ConditionMet(); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; size_t crashed_tab_count_; @@ -139,16 +139,16 @@ class NetworkManagerInitObserver }; // Observes when webui login becomes ready on chromeos. -class LoginWebuiReadyObserver : public NotificationObserver { +class LoginWebuiReadyObserver : public content::NotificationObserver { public: explicit LoginWebuiReadyObserver(AutomationProvider* automation); virtual ~LoginWebuiReadyObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; DISALLOW_COPY_AND_ASSIGN(LoginWebuiReadyObserver); @@ -156,24 +156,25 @@ class LoginWebuiReadyObserver : public NotificationObserver { #endif // defined(OS_CHROMEOS) // Watches for NewTabUI page loads for performance timing purposes. -class NewTabUILoadObserver : public NotificationObserver { +class NewTabUILoadObserver : public content::NotificationObserver { public: explicit NewTabUILoadObserver(AutomationProvider* automation, Profile* profile); virtual ~NewTabUILoadObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; DISALLOW_COPY_AND_ASSIGN(NewTabUILoadObserver); }; -class NavigationControllerRestoredObserver : public NotificationObserver { +class NavigationControllerRestoredObserver + : public content::NotificationObserver { public: NavigationControllerRestoredObserver(AutomationProvider* automation, NavigationController* controller, @@ -181,14 +182,14 @@ class NavigationControllerRestoredObserver : public NotificationObserver { virtual ~NavigationControllerRestoredObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: bool FinishedRestoring(); void SendDone(); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; NavigationController* controller_; scoped_ptr<IPC::Message> reply_message_; @@ -196,7 +197,7 @@ class NavigationControllerRestoredObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(NavigationControllerRestoredObserver); }; -class NavigationNotificationObserver : public NotificationObserver { +class NavigationNotificationObserver : public content::NotificationObserver { public: NavigationNotificationObserver(NavigationController* controller, AutomationProvider* automation, @@ -207,13 +208,13 @@ class NavigationNotificationObserver : public NotificationObserver { virtual ~NavigationNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: void ConditionMet(AutomationMsg_NavigationResponseValues navigation_result); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; NavigationController* controller_; @@ -224,20 +225,20 @@ class NavigationNotificationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(NavigationNotificationObserver); }; -class TabStripNotificationObserver : public NotificationObserver { +class TabStripNotificationObserver : public content::NotificationObserver { public: TabStripNotificationObserver(int notification, AutomationProvider* automation); virtual ~TabStripNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); virtual void ObserveTab(NavigationController* controller) = 0; protected: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; int notification_; }; @@ -310,20 +311,20 @@ class TabCountChangeObserver : public TabStripModelObserver { }; // Observes when an extension has been uninstalled. -class ExtensionUninstallObserver : public NotificationObserver { +class ExtensionUninstallObserver : public content::NotificationObserver { public: ExtensionUninstallObserver(AutomationProvider* automation, IPC::Message* reply_message, const std::string& id); virtual ~ExtensionUninstallObserver(); - // Implementation of NotificationObserver. + // Implementation of content::NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; std::string id_; @@ -333,7 +334,8 @@ class ExtensionUninstallObserver : public NotificationObserver { // Observes when an extension has finished loading and is ready for use. Also // checks for possible install errors. -class ExtensionReadyNotificationObserver : public NotificationObserver { +class ExtensionReadyNotificationObserver + : public content::NotificationObserver { public: ExtensionReadyNotificationObserver(ExtensionProcessManager* manager, ExtensionService* service, @@ -344,11 +346,11 @@ class ExtensionReadyNotificationObserver : public NotificationObserver { // Implementation of NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; ExtensionProcessManager* manager_; ExtensionService* service_; base::WeakPtr<AutomationProvider> automation_; @@ -359,22 +361,23 @@ class ExtensionReadyNotificationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(ExtensionReadyNotificationObserver); }; -class ExtensionUnloadNotificationObserver : public NotificationObserver { +class ExtensionUnloadNotificationObserver + : public content::NotificationObserver { public: ExtensionUnloadNotificationObserver(); virtual ~ExtensionUnloadNotificationObserver(); // Implementation of NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); bool did_receive_unload_notification() { return did_receive_unload_notification_; } private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; bool did_receive_unload_notification_; DISALLOW_COPY_AND_ASSIGN(ExtensionUnloadNotificationObserver); @@ -384,7 +387,7 @@ class ExtensionUnloadNotificationObserver : public NotificationObserver { // service provides notifications for each extension that gets updated, but // it does not wait for the updated extensions to be installed or loaded. This // observer waits until all updated extensions have actually been loaded. -class ExtensionsUpdatedObserver : public NotificationObserver { +class ExtensionsUpdatedObserver : public content::NotificationObserver { public: ExtensionsUpdatedObserver(ExtensionProcessManager* manager, AutomationProvider* automation, @@ -393,11 +396,11 @@ class ExtensionsUpdatedObserver : public NotificationObserver { // Implementation of NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; ExtensionProcessManager* manager_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -407,7 +410,8 @@ class ExtensionsUpdatedObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(ExtensionsUpdatedObserver); }; -class ExtensionTestResultNotificationObserver : public NotificationObserver { +class ExtensionTestResultNotificationObserver + : public content::NotificationObserver { public: explicit ExtensionTestResultNotificationObserver( AutomationProvider* automation); @@ -415,15 +419,15 @@ class ExtensionTestResultNotificationObserver : public NotificationObserver { // Implementation of NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Sends a test result back to the provider's client, if there is a pending // provider message and there is a result in the queue. void MaybeSendResult(); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; // Two queues containing the test results. Although typically only // one result will be in each queue, there are cases where a queue is @@ -440,20 +444,20 @@ class ExtensionTestResultNotificationObserver : public NotificationObserver { // Observes when a new browser has been opened and a tab within it has stopped // loading. -class BrowserOpenedNotificationObserver : public NotificationObserver { +class BrowserOpenedNotificationObserver : public content::NotificationObserver { public: BrowserOpenedNotificationObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual ~BrowserOpenedNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); void set_for_browser_command(bool for_browser_command); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; int new_window_id_; @@ -462,7 +466,7 @@ class BrowserOpenedNotificationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(BrowserOpenedNotificationObserver); }; -class BrowserClosedNotificationObserver : public NotificationObserver { +class BrowserClosedNotificationObserver : public content::NotificationObserver { public: BrowserClosedNotificationObserver(Browser* browser, AutomationProvider* automation, @@ -470,13 +474,13 @@ class BrowserClosedNotificationObserver : public NotificationObserver { virtual ~BrowserClosedNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); void set_for_browser_command(bool for_browser_command); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; bool for_browser_command_; @@ -484,7 +488,8 @@ class BrowserClosedNotificationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(BrowserClosedNotificationObserver); }; -class BrowserCountChangeNotificationObserver : public NotificationObserver { +class BrowserCountChangeNotificationObserver + : public content::NotificationObserver { public: BrowserCountChangeNotificationObserver(int target_count, AutomationProvider* automation, @@ -492,37 +497,37 @@ class BrowserCountChangeNotificationObserver : public NotificationObserver { virtual ~BrowserCountChangeNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: int target_count_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; DISALLOW_COPY_AND_ASSIGN(BrowserCountChangeNotificationObserver); }; -class AppModalDialogShownObserver : public NotificationObserver { +class AppModalDialogShownObserver : public content::NotificationObserver { public: AppModalDialogShownObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual ~AppModalDialogShownObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; DISALLOW_COPY_AND_ASSIGN(AppModalDialogShownObserver); }; -class ExecuteBrowserCommandObserver : public NotificationObserver { +class ExecuteBrowserCommandObserver : public content::NotificationObserver { public: virtual ~ExecuteBrowserCommandObserver(); @@ -532,8 +537,8 @@ class ExecuteBrowserCommandObserver : public NotificationObserver { IPC::Message* reply_message); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: ExecuteBrowserCommandObserver(AutomationProvider* automation, @@ -543,7 +548,7 @@ class ExecuteBrowserCommandObserver : public NotificationObserver { bool Getint(int command, int* type); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; int notification_type_; scoped_ptr<IPC::Message> reply_message_; @@ -551,7 +556,7 @@ class ExecuteBrowserCommandObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(ExecuteBrowserCommandObserver); }; -class FindInPageNotificationObserver : public NotificationObserver { +class FindInPageNotificationObserver : public content::NotificationObserver { public: FindInPageNotificationObserver(AutomationProvider* automation, TabContents* parent_tab, @@ -560,8 +565,8 @@ class FindInPageNotificationObserver : public NotificationObserver { virtual ~FindInPageNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // The Find mechanism is over asynchronous IPC, so a search is kicked off and // we wait for notification to find out what the results are. As the user is @@ -573,7 +578,7 @@ class FindInPageNotificationObserver : public NotificationObserver { static const int kFindInPageRequestId; private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; // We will at some point (before final update) be notified of the ordinal and // we need to preserve it so we can send it later. @@ -585,20 +590,20 @@ class FindInPageNotificationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(FindInPageNotificationObserver); }; -class DomOperationObserver : public NotificationObserver { +class DomOperationObserver : public content::NotificationObserver { public: DomOperationObserver(); virtual ~DomOperationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE; virtual void OnDomOperationCompleted(const std::string& json) = 0; virtual void OnModalDialogShown() = 0; private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(DomOperationObserver); }; @@ -623,17 +628,18 @@ class DomOperationMessageSender : public DomOperationObserver { DISALLOW_COPY_AND_ASSIGN(DomOperationMessageSender); }; -class DocumentPrintedNotificationObserver : public NotificationObserver { +class DocumentPrintedNotificationObserver + : public content::NotificationObserver { public: DocumentPrintedNotificationObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual ~DocumentPrintedNotificationObserver(); - virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details); + virtual void Observe(int type, const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; bool success_; scoped_ptr<IPC::Message> reply_message_; @@ -642,7 +648,7 @@ class DocumentPrintedNotificationObserver : public NotificationObserver { }; // Collects METRIC_EVENT_DURATION notifications and keep track of the times. -class MetricEventDurationObserver : public NotificationObserver { +class MetricEventDurationObserver : public content::NotificationObserver { public: MetricEventDurationObserver(); virtual ~MetricEventDurationObserver(); @@ -651,11 +657,11 @@ class MetricEventDurationObserver : public NotificationObserver { int GetEventDurationMs(const std::string& event_name); // NotificationObserver interface. - virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details); + virtual void Observe(int type, const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; typedef std::map<std::string, int> EventDurationMap; EventDurationMap durations_; @@ -663,27 +669,27 @@ class MetricEventDurationObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(MetricEventDurationObserver); }; -class PageTranslatedObserver : public NotificationObserver { +class PageTranslatedObserver : public content::NotificationObserver { public: PageTranslatedObserver(AutomationProvider* automation, IPC::Message* reply_message, TabContents* tab_contents); virtual ~PageTranslatedObserver(); - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; DISALLOW_COPY_AND_ASSIGN(PageTranslatedObserver); }; -class TabLanguageDeterminedObserver : public NotificationObserver { +class TabLanguageDeterminedObserver : public content::NotificationObserver { public: TabLanguageDeterminedObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -691,13 +697,13 @@ class TabLanguageDeterminedObserver : public NotificationObserver { TranslateInfoBarDelegate* translate_bar); virtual ~TabLanguageDeterminedObserver(); - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; TabContents* tab_contents_; @@ -706,7 +712,7 @@ class TabLanguageDeterminedObserver : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(TabLanguageDeterminedObserver); }; -class InfoBarCountObserver : public NotificationObserver { +class InfoBarCountObserver : public content::NotificationObserver { public: InfoBarCountObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -714,17 +720,17 @@ class InfoBarCountObserver : public NotificationObserver { size_t target_count); virtual ~InfoBarCountObserver(); - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: // Checks whether the infobar count matches our target, and if so // sends the reply message and deletes itself. void CheckCount(); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; TabContentsWrapper* tab_contents_; @@ -762,7 +768,7 @@ class LoginObserver : public chromeos::LoginStatusConsumer { // Collects SCREEN_LOCK_STATE_CHANGED notifications and returns // whether authentication succeeded to the automation provider. -class ScreenLockUnlockObserver : public NotificationObserver { +class ScreenLockUnlockObserver : public content::NotificationObserver { public: // Set lock_screen to true to observe lock screen events, // false for unlock screen events. @@ -771,16 +777,16 @@ class ScreenLockUnlockObserver : public NotificationObserver { bool lock_screen); virtual ~ScreenLockUnlockObserver(); - // NotificationObserver interface. - virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details); + // content::NotificationObserver interface. + virtual void Observe(int type, const content::NotificationSource& source, + const content::NotificationDetails& details); protected: base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; bool lock_screen_; DISALLOW_COPY_AND_ASSIGN(ScreenLockUnlockObserver); @@ -1236,7 +1242,7 @@ class PasswordStoreLoginsChangedObserver : public base::RefCountedThreadSafe< PasswordStoreLoginsChangedObserver, BrowserThread::DeleteOnUIThread>, - public NotificationObserver { + public content::NotificationObserver { public: PasswordStoreLoginsChangedObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -1247,10 +1253,10 @@ class PasswordStoreLoginsChangedObserver // Schedules a task on the DB thread to register the appropriate observers. virtual void Init(); - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>; @@ -1268,7 +1274,7 @@ class PasswordStoreLoginsChangedObserver base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; PasswordStoreChange::Type expected_type_; std::string result_key_; @@ -1297,7 +1303,7 @@ class AutomationProviderBrowsingDataObserver // Allows automation provider to wait until page load after selecting an item // in the omnibox popup. -class OmniboxAcceptNotificationObserver : public NotificationObserver { +class OmniboxAcceptNotificationObserver : public content::NotificationObserver { public: OmniboxAcceptNotificationObserver(NavigationController* controller, AutomationProvider* automation, @@ -1305,11 +1311,11 @@ class OmniboxAcceptNotificationObserver : public NotificationObserver { virtual ~OmniboxAcceptNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; NavigationController* controller_; @@ -1318,7 +1324,7 @@ class OmniboxAcceptNotificationObserver : public NotificationObserver { }; // Allows the automation provider to wait for a save package notification. -class SavePackageNotificationObserver : public NotificationObserver { +class SavePackageNotificationObserver : public content::NotificationObserver { public: SavePackageNotificationObserver(DownloadManager* download_manager, AutomationProvider* automation, @@ -1326,11 +1332,11 @@ class SavePackageNotificationObserver : public NotificationObserver { virtual ~SavePackageNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1375,7 +1381,7 @@ class PageSnapshotTaker : public DomOperationObserver { DISALLOW_COPY_AND_ASSIGN(PageSnapshotTaker); }; -class NTPInfoObserver : public NotificationObserver { +class NTPInfoObserver : public content::NotificationObserver { public: NTPInfoObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -1383,8 +1389,8 @@ class NTPInfoObserver : public NotificationObserver { virtual ~NTPInfoObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: void OnTopSitesLoaded(); @@ -1396,14 +1402,14 @@ class NTPInfoObserver : public NotificationObserver { CancelableRequestProvider::Handle request_; scoped_ptr<base::DictionaryValue> ntp_info_; history::TopSites* top_sites_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(NTPInfoObserver); }; // Observes when an app has been launched, as indicated by a notification that // a content load in some tab has stopped. -class AppLaunchObserver : public NotificationObserver { +class AppLaunchObserver : public content::NotificationObserver { public: AppLaunchObserver(NavigationController* controller, AutomationProvider* automation, @@ -1412,14 +1418,14 @@ class AppLaunchObserver : public NotificationObserver { virtual ~AppLaunchObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: NavigationController* controller_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; extension_misc::LaunchContainer launch_container_; int new_window_id_; @@ -1431,7 +1437,7 @@ class AppLaunchObserver : public NotificationObserver { // has been shown in the renderer; (2) a webpage form is filled or previewed // with Autofill suggestions. A constructor argument specifies the appropriate // notification to wait for. -class AutofillDisplayedObserver : public NotificationObserver { +class AutofillDisplayedObserver : public content::NotificationObserver { public: AutofillDisplayedObserver(int notification, RenderViewHost* render_view_host, @@ -1439,17 +1445,17 @@ class AutofillDisplayedObserver : public NotificationObserver { IPC::Message* reply_message); virtual ~AutofillDisplayedObserver(); - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: int notification_; RenderViewHost* render_view_host_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(AutofillDisplayedObserver); }; @@ -1461,7 +1467,7 @@ class AutofillChangedObserver : public base::RefCountedThreadSafe< AutofillChangedObserver, BrowserThread::DeleteOnUIThread>, - public NotificationObserver { + public content::NotificationObserver { public: AutofillChangedObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -1472,10 +1478,10 @@ class AutofillChangedObserver // Schedules a task on the DB thread to register the appropriate observers. virtual void Init(); - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>; @@ -1490,7 +1496,7 @@ class AutofillChangedObserver base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; int num_profiles_; int num_credit_cards_; @@ -1507,7 +1513,7 @@ class AutofillChangedObserver // causes a confirm infobar to appear). class AutofillFormSubmittedObserver : public PersonalDataManagerObserver, - public NotificationObserver { + public content::NotificationObserver { public: AutofillFormSubmittedObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -1518,13 +1524,13 @@ class AutofillFormSubmittedObserver virtual void OnPersonalDataChanged() OVERRIDE; virtual void OnInsufficientFormData() OVERRIDE; - // NotificationObserver interface. + // content::NotificationObserver interface. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; PersonalDataManager* pdm_; @@ -1533,15 +1539,15 @@ class AutofillFormSubmittedObserver // Allows the automation provider to wait until all the notification // processes are ready. -class GetAllNotificationsObserver : public NotificationObserver { +class GetAllNotificationsObserver : public content::NotificationObserver { public: GetAllNotificationsObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual ~GetAllNotificationsObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: // Sends a message via the |AutomationProvider|. |automation_| must be valid. @@ -1559,17 +1565,17 @@ class GetAllNotificationsObserver : public NotificationObserver { // Allows the automation provider to wait for a new notification balloon // to appear and be ready. -class NewNotificationBalloonObserver : public NotificationObserver { +class NewNotificationBalloonObserver : public content::NotificationObserver { public: NewNotificationBalloonObserver(AutomationProvider* provider, IPC::Message* reply_message); virtual ~NewNotificationBalloonObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1578,7 +1584,8 @@ class NewNotificationBalloonObserver : public NotificationObserver { // Allows the automation provider to wait for a given number of // notification balloons. -class OnNotificationBalloonCountObserver : public NotificationObserver { +class OnNotificationBalloonCountObserver + : public content::NotificationObserver { public: OnNotificationBalloonCountObserver(AutomationProvider* provider, IPC::Message* reply_message, @@ -1591,11 +1598,11 @@ class OnNotificationBalloonCountObserver : public NotificationObserver { void CheckBalloonCount(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1607,18 +1614,18 @@ class OnNotificationBalloonCountObserver : public NotificationObserver { // Allows the automation provider to wait for a RENDERER_PROCESS_CLOSED // notification. -class RendererProcessClosedObserver : public NotificationObserver { +class RendererProcessClosedObserver : public content::NotificationObserver { public: RendererProcessClosedObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual ~RendererProcessClosedObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1627,7 +1634,7 @@ class RendererProcessClosedObserver : public NotificationObserver { // Allows the automation provider to wait for acknowledgement that a certain // type and number of input events has been processed by the renderer. -class InputEventAckNotificationObserver : public NotificationObserver { +class InputEventAckNotificationObserver : public content::NotificationObserver { public: InputEventAckNotificationObserver(AutomationProvider* automation, IPC::Message* reply_message, @@ -1635,11 +1642,11 @@ class InputEventAckNotificationObserver : public NotificationObserver { virtual ~InputEventAckNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; int event_type_; @@ -1653,7 +1660,7 @@ class InputEventAckNotificationObserver : public NotificationObserver { // creation. Will send a message on construction if no tabs are loading // currently. class AllTabsStoppedLoadingObserver : public TabEventObserver, - public NotificationObserver { + public content::NotificationObserver { public: AllTabsStoppedLoadingObserver(AutomationProvider* automation, IPC::Message* reply_message); @@ -1663,10 +1670,10 @@ class AllTabsStoppedLoadingObserver : public TabEventObserver, virtual void OnFirstPendingLoad(TabContents* tab_contents) OVERRIDE; virtual void OnNoMorePendingLoads(TabContents* tab_contents) OVERRIDE; - // NotificationObserver implementation. + // content::NotificationObserver implementation. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE; private: typedef std::set<TabContents*> TabSet; @@ -1676,7 +1683,7 @@ class AllTabsStoppedLoadingObserver : public TabEventObserver, void CheckIfNoMorePendingLoads(); TabSet pending_tabs_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1684,18 +1691,18 @@ class AllTabsStoppedLoadingObserver : public TabEventObserver, }; // Observer used to listen for new tab creation to complete. -class NewTabObserver : public NotificationObserver { +class NewTabObserver : public content::NotificationObserver { public: NewTabObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE; private: virtual ~NewTabObserver(); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1739,18 +1746,19 @@ class WaitForProcessLauncherThreadToGoIdleObserver // Allows the automation provider to wait for acknowledgement that a drop // operation has been processed by the renderer. -class DragTargetDropAckNotificationObserver : public NotificationObserver { +class DragTargetDropAckNotificationObserver + : public content::NotificationObserver { public: DragTargetDropAckNotificationObserver(AutomationProvider* automation, IPC::Message* reply_message); virtual ~DragTargetDropAckNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; @@ -1782,7 +1790,7 @@ class ProcessInfoObserver : public MemoryDetails { // window creation, it creates a new tab and then finally observes it finish // loading. class BrowserOpenedWithNewProfileNotificationObserver - : public NotificationObserver { + : public content::NotificationObserver { public: BrowserOpenedWithNewProfileNotificationObserver( AutomationProvider* automation, @@ -1790,11 +1798,11 @@ class BrowserOpenedWithNewProfileNotificationObserver virtual ~BrowserOpenedWithNewProfileNotificationObserver(); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; base::WeakPtr<AutomationProvider> automation_; scoped_ptr<IPC::Message> reply_message_; int new_window_id_; |