From ee2202ac7e049013bfe2528382fc58c348b2e532 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Tue, 11 Dec 2012 01:07:20 +0000 Subject: Remove TabContents from dev tools. BUG=107201 TEST=no visible change Review URL: https://chromiumcodereview.appspot.com/11489005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172216 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/gtk/browser_window_gtk.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc') diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 04dba7d..8011533 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -2302,18 +2302,16 @@ void BrowserWindowGtk::UpdateDevToolsForContents(WebContents* contents) { // Replace tab contents. if (devtools_window_ != new_devtools_window) { - if (devtools_window_) { - devtools_container_->DetachTab( - devtools_window_->tab_contents()->web_contents()); - } - devtools_container_->SetTab(new_devtools_window ? - new_devtools_window->tab_contents()->web_contents() : NULL); + if (devtools_window_) + devtools_container_->DetachTab(devtools_window_->web_contents()); + devtools_container_->SetTab( + new_devtools_window ? new_devtools_window->web_contents() : NULL); if (new_devtools_window) { - // WebContentsViewGtk::WasShown is not called when tab contents is shown + // WebContentsViewGtk::WasShown is not called when a web contents is shown // by anything other than user selecting a Tab. // See TabContentsViewViews::OnWindowPosChanged for reference on how it // should be implemented. - new_devtools_window->tab_contents()->web_contents()->WasShown(); + new_devtools_window->web_contents()->WasShown(); } } -- cgit v1.1