Fix OpaqueBrowserFrameView title painting.

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 1555d95b22639d5b164523566ded4be940f4f007..73f19f12e36b90cf73b7520cb14c17a24ac7f31a 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -20,6 +20,7 @@ class TabIconView;
 namespace views {
 class ImageButton;
 class FrameBackground;
+class Label;
 }
 
 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
@@ -130,7 +131,6 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   // and titlebar background are a contiguous component.
   void PaintRestoredFrameBorder(gfx::Canvas* canvas);
   void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
-  void PaintTitleBar(gfx::Canvas* canvas);
   void PaintToolbarBackground(gfx::Canvas* canvas);
   void PaintRestoredClientEdge(gfx::Canvas* canvas);
 
@@ -148,9 +148,6 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
 
-  // The layout rect of the title, if visible.
-  gfx::Rect title_bounds_;
-
   // The layout rect of the avatar icon, if visible.
   gfx::Rect avatar_bounds_;
 
@@ -160,8 +157,9 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   views::ImageButton* restore_button_;
   views::ImageButton* close_button_;
 
-  // The Window icon.
+  // The window icon and title.
   TabIconView* window_icon_;
+  views::Label* window_title_;
 
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;