diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
| commit | 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch) | |
| tree | a75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/debugger/devtools_window.cc | |
| parent | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff) | |
| download | chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/debugger/devtools_window.cc')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 2d072d9..0490567 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -149,16 +149,19 @@ DevToolsWindow::DevToolsWindow(TabContentsWrapper* tab_contents, entry->favicon().set_is_valid(true); // Register on-load actions. - registrar_.Add(this, - content::NOTIFICATION_LOAD_STOP, - Source<NavigationController>(&tab_contents_->controller())); - registrar_.Add(this, - content::NOTIFICATION_TAB_CLOSING, - Source<NavigationController>(&tab_contents_->controller())); + registrar_.Add( + this, + content::NOTIFICATION_LOAD_STOP, + content::Source<NavigationController>(&tab_contents_->controller())); + registrar_.Add( + this, + content::NOTIFICATION_TAB_CLOSING, + content::Source<NavigationController>(&tab_contents_->controller())); registrar_.Add( this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, - Source<ThemeService>(ThemeServiceFactory::GetForProfile(profile_))); + content::Source<ThemeService>( + ThemeServiceFactory::GetForProfile(profile_))); // There is no inspected_rvh in case of shared workers. if (inspected_rvh) { TabContents* tab = inspected_rvh->delegate()->GetAsTabContents(); @@ -448,15 +451,15 @@ void DevToolsWindow::CallClientFunction(const string16& function_name, } void DevToolsWindow::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == content::NOTIFICATION_LOAD_STOP && !is_loaded_) { is_loaded_ = true; UpdateTheme(); DoAction(); AddDevToolsExtensionsToClient(); } else if (type == content::NOTIFICATION_TAB_CLOSING) { - if (Source<NavigationController>(source).ptr() == + if (content::Source<NavigationController>(source).ptr() == &tab_contents_->controller()) { // This happens when browser closes all of its tabs as a result // of window.Close event. |