Entire DOMBrowser stack

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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index 0303d3ac7777194f44ccaed2d6c0cb6f7be31340..d23a4b53a5e74d70a7bb85329b0c3808e96018bb 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -22,6 +22,12 @@ class ImageButton;
 class ImageView;
 }
 
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+namespace chromeos {
+class DOMBrowserFrameView;
+}
+#endif
+
 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
                                public views::ButtonListener,
                                public TabIconView::TabIconViewModel {
@@ -69,6 +75,11 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   virtual SkBitmap GetFavIconForTabIconView();
 
  private:
+
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+  friend class chromeos::DOMBrowserFrameView;
+#endif
+
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.  If |restored| is true, acts as if
   // the window is restored regardless of the real mode.
@@ -119,7 +130,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   // Layout various sub-components of this view.
   void LayoutWindowControls();
   void LayoutTitleBar();
-  void LayoutOTRAvatar();
+  virtual void LayoutOTRAvatar();
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;