Entire DOMBrowser stack

chrome/browser/ui/views/frame/browser_view.h

Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 1610d806e57ee1b62e330625833fd35ab41b83a6..3dd210feea6f940a16463bacd297e14c36fc194d 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -69,6 +69,16 @@ class ExternalFocusTracker;
 class Menu;
 }
 
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+namespace chromeos {
+class DOMBrowserView;
+}
+#endif
+
+// The name of a key to store on the window handle so that other code can
+// locate this object using just the handle.
+const char* const kBrowserViewKey = "__BROWSER_VIEW__";
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView
 //
@@ -114,17 +124,17 @@ class BrowserView : public BrowserBubbleHost,
 
   // Called by the frame to notify the BrowserView that it was moved, and that
   // any dependent popup windows should be repositioned.
-  void WindowMoved();
+  virtual void WindowMoved();
 
   // Called by the frame to notify the BrowserView that a move or resize was
   // initiated.
-  void WindowMoveOrResizeStarted();
+  virtual void WindowMoveOrResizeStarted();
 
   // Returns the apparent bounds of the toolbar, in BrowserView coordinates.
   // These differ from |toolbar_.bounds()| in that they match where the toolbar
   // background image is drawn -- slightly outside the "true" bounds
   // horizontally, and, when using vertical tabs, behind the tab column.
-  gfx::Rect GetToolbarBounds() const;
+  virtual gfx::Rect GetToolbarBounds() const;
 
   // Returns the bounds of the content area, in the coordinates of the
   // BrowserView's parent.
@@ -139,7 +149,7 @@ class BrowserView : public BrowserBubbleHost,
 
   // Returns the preferred height of the TabStrip. Used to position the OTR
   // avatar icon.
-  int GetTabStripHeight() const;
+  virtual int GetTabStripHeight() const;
 
   // Takes some view's origin (relative to this BrowserView) and offsets it such
   // that it can be used as the source origin for seamlessly tiling the toolbar
@@ -157,7 +167,7 @@ class BrowserView : public BrowserBubbleHost,
   ToolbarView* toolbar() const { return toolbar_; }
 
   // Returns true if various window components are visible.
-  bool IsTabStripVisible() const;
+  virtual bool IsTabStripVisible() const;
 
   // Returns true if the vertical tabstrip is in use.
   bool UseVerticalTabs() const;
@@ -171,7 +181,7 @@ class BrowserView : public BrowserBubbleHost,
   bool ShouldShowOffTheRecordAvatar() const;
 
   // Handle the specified |accelerator| being pressed.
-  bool AcceleratorPressed(const views::Accelerator& accelerator);
+  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
 
   // Provides the containing frame with the accelerator for the specified
   // command id. This can be used to provide menu item shortcut hints etc.
@@ -433,12 +443,20 @@ class BrowserView : public BrowserBubbleHost,
   // mode for the tabstrip changes from horizontal to vertical.
   virtual void InitTabStrip(TabStripModel* tab_strip_model);
 
+  // Initializes the Toolbar. This is factored out of Init to allow for
+  // overriding.
+  virtual void InitToolbar(Browser* browser);
+
   // Browser window related initializations.
   virtual void Init();
 
  private:
   friend class BrowserViewLayout;
 
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+  friend class chromeos::DOMBrowserView;
+#endif
+
 #if defined(OS_WIN)
   // Creates the system menu.
   void InitSystemMenu();
@@ -510,7 +528,7 @@ class BrowserView : public BrowserBubbleHost,
   int GetCommandIDForAppCommandID(int app_command_id) const;
 
   // Callback for the loading animation(s) associated with this view.
-  void LoadingAnimationCallback();
+  virtual void LoadingAnimationCallback();
 
   // Initialize the hung plugin detector.
   void InitHangMonitor();