| 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 4ede54646892596026094d4f3c1ea5e0d01cd8d4..3e2eba1a7ace86997f6d6a0b4ad51665b994dd0e 100644 | 
| --- a/chrome/browser/ui/views/frame/browser_view.h | 
| +++ b/chrome/browser/ui/views/frame/browser_view.h | 
| @@ -104,17 +104,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. | 
| @@ -129,7 +129,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 | 
| @@ -147,7 +147,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; | 
| @@ -158,7 +158,7 @@ class BrowserView : public BrowserBubbleHost, | 
|  | 
| // Returns true if the non-client view should render the Off-The-Record | 
| // avatar icon if the window is incognito. | 
| -  bool ShouldShowOffTheRecordAvatar() const; | 
| +  virtual bool ShouldShowOffTheRecordAvatar() const; | 
|  | 
| // Handle the specified |accelerator| being pressed. | 
| virtual bool AcceleratorPressed(const views::Accelerator& accelerator); | 
| @@ -411,7 +411,7 @@ class BrowserView : public BrowserBubbleHost, | 
|  | 
| // Factory Methods. | 
| // Returns a new LayoutManager for this browser view. A subclass may | 
| -  // override to implemnet different layout pocily. | 
| +  // override to implement different layout potentially. | 
| virtual views::LayoutManager* CreateLayoutManager() const; | 
|  | 
| // Initializes a new TabStrip for the browser view. This can be performed | 
| @@ -419,9 +419,17 @@ class BrowserView : public BrowserBubbleHost, | 
| // mode for the tabstrip changes from horizontal to vertical. | 
| virtual void InitTabStrip(TabStripModel* tab_strip_model); | 
|  | 
| +  // Factory Methods. | 
| +  // Returns a new ToolbarView for this browser view. A subclass may | 
| +  // override to implement different layout potentially. | 
| +  virtual ToolbarView* CreateToolbar() const; | 
| + | 
| // Browser window related initializations. | 
| virtual void Init(); | 
|  | 
| +  // Callback for the loading animation(s) associated with this view. | 
| +  virtual void LoadingAnimationCallback(); | 
| + | 
| private: | 
| friend class BrowserViewLayout; | 
| FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, | 
| @@ -497,9 +505,6 @@ class BrowserView : public BrowserBubbleHost, | 
| // Retrieves the command id for the specified Windows app command. | 
| int GetCommandIDForAppCommandID(int app_command_id) const; | 
|  | 
| -  // Callback for the loading animation(s) associated with this view. | 
| -  void LoadingAnimationCallback(); | 
| - | 
| // Initialize the hung plugin detector. | 
| void InitHangMonitor(); | 
|  | 
| @@ -522,6 +527,9 @@ class BrowserView : public BrowserBubbleHost, | 
| // Shows the about chrome modal dialog and returns the Window object. | 
| views::Window* DoShowAboutChromeDialog(); | 
|  | 
| +  // Set the value of |toolbar_| and hook it into the views hiearchy | 
| +  void SetToolbar(ToolbarView* toolbar); | 
| + | 
| // Last focused view that issued a tab traversal. | 
| int last_focused_view_storage_id_; | 
|  | 
|  |