Revert r161932 "DevTools: [Linux] "dock to right" is broken after turning a tab into a window."

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 211 matching lines @@
 
 GQuark GetBrowserWindowQuarkKey() {
   static GQuark quark = g_quark_from_static_string(kBrowserWindowKey);
   return quark;
 }
 
 }  // namespace
 
 BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
     :  window_(NULL),
-       window_has_shown_(false),
        window_container_(NULL),
        window_vbox_(NULL),
        render_area_vbox_(NULL),
        render_area_floating_container_(NULL),
        render_area_event_box_(NULL),
        toolbar_border_(NULL),
        browser_(browser),
        state_(GDK_WINDOW_STATE_WITHDRAWN),
        devtools_dock_side_(DEVTOOLS_DOCK_SIDE_BOTTOM),
        contents_hsplit_(NULL),
@@ skipping 354 matching lines @@
     gtk_window_iconify(window_);
     show_state_after_show_ = ui::SHOW_STATE_NORMAL;
   }
 
   // If we have sized the window by setting a size request for the render
   // area, then undo it so that the render view can later adjust its own
   // size.
   gtk_widget_set_size_request(contents_container_->widget(), -1, -1);
 
   browser()->OnWindowDidShow();
-  window_has_shown_ = true;
-  UpdateDevTools();
 }
 
 void BrowserWindowGtk::ShowInactive() {
   gtk_window_set_focus_on_map(window_, false);
   gtk_widget_show(GTK_WIDGET(window_));
 }
 
 void BrowserWindowGtk::SetBoundsImpl(const gfx::Rect& bounds,
                                      bool exterior,
                                      bool move) {
@@ skipping 51 matching lines @@
   // Cancel any pending callback from the window configure debounce timer.
   window_configure_debounce_timer_.Stop();
 
   // Likewise for the loading animation.
   loading_animation_timer_.Stop();
 
   GtkWidget* window = GTK_WIDGET(window_);
   // 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
   // the window is destroyed.
   global_menu_bar_->Disable();
   gtk_widget_destroy(window);
 }
 
 void BrowserWindowGtk::Activate() {
   gtk_window_present(window_);
@@ skipping 655 matching lines @@
 
   toolbar_->UpdateForBookmarkBarVisibility(state == BookmarkBar::DETACHED);
   PlaceBookmarkBar(state == BookmarkBar::DETACHED);
   bookmark_bar_->SetBookmarkBarState(
       state,
       animate ? BookmarkBar::ANIMATE_STATE_CHANGE :
                 BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 }
 
 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 ?
       DevToolsWindow::GetDevToolsContents(contents) : NULL;
   if (old_devtools == devtools_contents)
     return;
 
   if (old_devtools)
     devtools_container_->DetachTab(old_devtools);
 
@@ skipping 1059 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }