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

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 11192006: Revert r161932 "DevTools: [Linux] "dock to right" is broken after turning a tab into a window." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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/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 78e29771292f002041131599b19a7af09d1c7ab2..4ac7cf0a0ff6b154bd936a030a8c680a853c0e55 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -229,7 +229,6 @@ GQuark GetBrowserWindowQuarkKey() {
BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
: window_(NULL),
- window_has_shown_(false),
window_container_(NULL),
window_vbox_(NULL),
render_area_vbox_(NULL),
@@ -604,8 +603,6 @@ void BrowserWindowGtk::Show() {
gtk_widget_set_size_request(contents_container_->widget(), -1, -1);
browser()->OnWindowDidShow();
- window_has_shown_ = true;
- UpdateDevTools();
}
void BrowserWindowGtk::ShowInactive() {
@@ -677,7 +674,6 @@ void BrowserWindowGtk::Close() {
// To help catch bugs in any event handlers that might get fired during the
// destruction, set window_ to NULL before any handlers will run.
window_ = NULL;
- window_has_shown_ = false;
titlebar_->set_window(NULL);
// We don't want GlobalMenuBar handling any notifications or commands after
@@ -1353,8 +1349,6 @@ void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) {
}
void BrowserWindowGtk::UpdateDevToolsForContents(WebContents* contents) {
- if (!window_has_shown_)
- return;
TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::UpdateDevToolsForContents");
TabContents* old_devtools = devtools_container_->tab();
TabContents* devtools_contents = contents ?
« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.h ('k') | chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698