diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
| commit | 10b833ebf1528dbfd186018c66961956bd2a9e39 (patch) | |
| tree | fcf3bd5c31c45e7472ae8c4445a796990693be49 /chrome/browser/debugger/devtools_window.cc | |
| parent | 2b833518315d574e12ec8120785116da2d0bf993 (diff) | |
| download | chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.zip chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.gz chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.bz2 | |
Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests
on win,linux,mac.
Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
TBR=jam
Review URL: http://codereview.chromium.org/9018016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_window.cc')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index f1f2399..384f854 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -161,7 +161,7 @@ DevToolsWindow* DevToolsWindow::Create( Browser::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL); tab_contents->tab_contents()->GetRenderViewHost()->AllowBindings( content::BINDINGS_POLICY_WEB_UI); - tab_contents->tab_contents()->GetController().LoadURL( + tab_contents->tab_contents()->controller().LoadURL( GetDevToolsUrl(profile, docked, shared_worker_frontend), content::Referrer(), content::PAGE_TRANSITION_START_PAGE, @@ -187,7 +187,7 @@ DevToolsWindow::DevToolsWindow(TabContentsWrapper* tab_contents, g_instances.Get().push_back(this); // Wipe out page icon so that the default application icon is used. NavigationEntry* entry = - tab_contents_->tab_contents()->GetController().GetActiveEntry(); + tab_contents_->tab_contents()->controller().GetActiveEntry(); entry->favicon().set_bitmap(SkBitmap()); entry->favicon().set_is_valid(true); @@ -196,12 +196,12 @@ DevToolsWindow::DevToolsWindow(TabContentsWrapper* tab_contents, this, content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &tab_contents_->tab_contents()->GetController())); + &tab_contents_->tab_contents()->controller())); registrar_.Add( this, content::NOTIFICATION_TAB_CLOSING, content::Source<NavigationController>( - &tab_contents_->tab_contents()->GetController())); + &tab_contents_->tab_contents()->controller())); registrar_.Add( this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, @@ -369,7 +369,7 @@ bool DevToolsWindow::FindInspectedBrowserAndTabIndex(Browser** browser, return false; const NavigationController& controller = - inspected_tab_->tab_contents()->GetController(); + inspected_tab_->tab_contents()->controller(); for (BrowserList::const_iterator it = BrowserList::begin(); it != BrowserList::end(); ++it) { int tab_index = (*it)->GetIndexOfController(&controller); @@ -469,7 +469,7 @@ void DevToolsWindow::Observe(int type, AddDevToolsExtensionsToClient(); } else if (type == content::NOTIFICATION_TAB_CLOSING) { if (content::Source<NavigationController>(source).ptr() == - &tab_contents_->tab_contents()->GetController()) { + &tab_contents_->tab_contents()->controller()) { // This happens when browser closes all of its tabs as a result // of window.Close event. // Notify manager that this DevToolsClientHost no longer exists and |