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

BUG=122772
TBR=yurys

Review URL: https://codereview.chromium.org/11192006/


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162172 0039d316-1c4b-4281-b951-d872f2087c98

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 ?

chrome/browser/ui/gtk/browser_window_gtk.h

@@ -269,8 +269,6 @@ class BrowserWindowGtk
   // |relative_to| coordinates. This is the middle of the omnibox location icon.
   int GetXPositionOfLocationIcon(GtkWidget* relative_to);
 
-  DevToolsDockSide devtools_dock_side() { return devtools_dock_side_; }
-
  protected:
   virtual void DestroyBrowser() OVERRIDE;
 
@@ -299,8 +297,6 @@ class BrowserWindowGtk
 
   // Top level window.
   GtkWindow* window_;
-  // Determines whether window was shown.
-  bool window_has_shown_;
   // GtkAlignment that holds the interior components of the chromium window.
   // This is used to draw the custom frame border and content shadow.
   GtkWidget* window_container_;

chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc

@@ -756,8 +756,6 @@ bool DraggedTabControllerGtk::CompleteDrag() {
         base::Bind(&DraggedTabControllerGtk::OnAnimateToBoundsComplete,
                    base::Unretained(this)));
     destroy_immediately = false;
-    attached_tabstrip_->window()->SetDevToolsDockSide(
-        source_tabstrip_->window()->devtools_dock_side());
   } else {
     // Compel the model to construct a new window for the detached
     // TabContents.
@@ -780,7 +778,6 @@ bool DraggedTabControllerGtk::CompleteDrag() {
                                      drag_data_->GetAddTypesForDraggedTabAt(i));
     }
     RestoreSelection(new_model);
-    new_browser->window()->SetDevToolsDockSide(window->devtools_dock_side());
     new_browser->window()->Show();
     CleanUpHiddenFrame();
   }