Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1941)

Unified Diff: chrome/browser/debugger/devtools_window.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/debugger/devtools_window.cc
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index f1f2399212c819c5e090b7085f23dbc82f41dea4..384f85466782f8ce07a9f3a0ad60b8854e27a474 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
« no previous file with comments | « chrome/browser/debugger/devtools_sanity_unittest.cc ('k') | chrome/browser/download/download_request_limiter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698