DevTools: “Dock to right” broken after turning a tab into a window of its own.

chrome/browser/ui/gtk/browser_window_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 12 matching lines @@
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/base/x/active_window_watcher_x_observer.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/rect.h"
 
 class BookmarkBarGtk;
 class Browser;
 class BrowserTitlebar;
 class BrowserToolbarGtk;
+class DevToolsWindow;
 class DownloadShelfGtk;
 class ExtensionKeybindingRegistryGtk;
 class FindBarGtk;
 class FullscreenExitBubbleGtk;
 class GlobalMenuBar;
 class InfoBarContainerGtk;
 class InstantPreviewControllerGtk;
 class LocationBar;
 class PrefService;
 class StatusBubbleGtk;
@@ skipping 151 matching lines @@
   virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
   virtual bool DrawInfoBarArrows(int* x) const OVERRIDE;
 
   // Overridden from ExtensionKeybindingRegistry::Delegate:
   virtual extensions::ActiveTabPermissionGranter*
       GetActiveTabPermissionGranter() OVERRIDE;
 
   // Accessor for the tab strip.
   TabStripGtk* tabstrip() const { return tabstrip_.get(); }
 
-  void UpdateDevToolsForContents(content::WebContents* contents);
-
-  // Shows docked devtools.
-  void ShowDevToolsContainer(DevToolsDockSide dock_side);
-
-  // Hides docked devtools.
-  void HideDevToolsContainer();
-
-  // Updates dock side orientation for the devtools.
-  void SetDevToolsDockSide(DevToolsDockSide side);
-
   void OnDebouncedBoundsChanged();
 
   // Request the underlying window to unmaximize.
   void UnMaximize();
 
   // Returns false if we're not ready to close yet.  E.g., a tab may have an
   // onbeforeunload handler that prevents us from closing.
   bool CanClose() const;
 
   // Returns whether to draw the content drop shadow on the sides and bottom
@@ skipping 221 matching lines @@
   bool IsTabStripSupported() const;
   bool IsToolbarSupported() const;
   bool IsBookmarkBarSupported() const;
 
   // Put the bookmark bar where it belongs.
   void PlaceBookmarkBar(bool is_floating);
 
   // Decides if we should draw the frame as if the window is active.
   bool DrawFrameAsActive() const;
 
+  // Updates devtools window for given contents. This method will show docked
+  // devtools window for inspected |contents| that has docked devtools
+  // and hide it for NULL or not inspected |contents|. It will also make
+  // sure devtools window size and position are restored for given tab.
+  void UpdateDevToolsForContents(content::WebContents* contents);
+
+  // Shows docked devtools.
+  void ShowDevToolsContainer();
+
+  // Hides docked devtools.
+  void HideDevToolsContainer();
+
+  // Reads split position from the current tab's devtools window and applies
+  // it to the devtools split.
+  void UpdateDevToolsSplitPosition();
+
+  // Tracks devtools split position
+  CHROMEGTK_CALLBACK_1(BrowserWindowGtk, gboolean, OnDevToolsSplitChange,

[yurys, 2012/10/25 15:35:24]

Nuke this.

[pfeldman, 2012/10/25 16:14:42]

Done.

+                       GdkEvent*);
+
   // Determine whether we use should default to native decorations or the custom
   // frame based on the currently-running window manager.
   static bool GetCustomFramePrefDefault();
 
   // The position and size of the current window.
   gfx::Rect bounds_;
 
   // The configure bounds of the current window, used to figure out whether to
   // ignore later configure events. See OnConfigure() for more information.
   gfx::Rect configure_bounds_;
@@ skipping 35 matching lines @@
   // A sub-controller that manages the Instant preview visual state.
   scoped_ptr<InstantPreviewControllerGtk> instant_preview_controller_;
 
   // The Extension Keybinding Registry responsible for registering listeners for
   // accelerators that are sent to the window, that are destined to be turned
   // into events and sent to the extension.
   scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_;
 
   DevToolsDockSide devtools_dock_side_;
 
+  // Docked devtools window instance. NULL when current tab is not inspected
+  // or is inspected with undocked version of DevToolsWindow.
+  DevToolsWindow* devtools_window_;
+
   // Split pane containing the contents_container_ and the devtools_container_.
   GtkWidget* contents_hsplit_;
 
   // Split pane containing the contents_hsplit_ and the devtools_container_.
   GtkWidget* contents_vsplit_;
 
   // The tab strip.  Always non-NULL.
   scoped_ptr<TabStripGtk> tabstrip_;
 
   // The container for info bars. Always non-NULL.
@@ skipping 34 matching lines @@
   scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;
 
   FullscreenExitBubbleType fullscreen_exit_bubble_type_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_