From 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 19 Oct 2011 02:52:53 +0000 Subject: Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser. This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header. BUG=98716 TBR=joi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/webui/net_internals_ui.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'chrome/browser/ui/webui/net_internals_ui.cc') diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index b730d47..302267b 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -41,7 +41,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_details.h" +#include "content/public/browser/notification_details.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" #include "net/base/escape.h" @@ -150,7 +150,7 @@ ChromeWebUIDataSource* CreateNetInternalsHTMLSource() { class NetInternalsMessageHandler : public WebUIMessageHandler, public base::SupportsWeakPtr, - public NotificationObserver { + public content::NotificationObserver { public: NetInternalsMessageHandler(); virtual ~NetInternalsMessageHandler(); @@ -164,10 +164,10 @@ class NetInternalsMessageHandler // message will be ignored. void SendJavascriptCommand(const std::string& command, Value* arg); - // 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; // Javascript message handlers. void OnRendererReady(const ListValue* list); @@ -570,13 +570,14 @@ void NetInternalsMessageHandler::SendJavascriptCommand( } } -void NetInternalsMessageHandler::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { +void NetInternalsMessageHandler::Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED); - std::string* pref_name = Details(details).ptr(); + std::string* pref_name = content::Details(details).ptr(); if (*pref_name == prefs::kHttpThrottlingEnabled) { SendJavascriptCommand( "receivedHttpThrottlingEnabledPrefChanged", -- cgit v1.1