Handle titlebar text updates properly

ash/wm/frame_painter.cc

Index: ash/wm/frame_painter.cc
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index fc950aec6b6ce1e6e22263560167bf6424969366..e86bc3b26c86b174d0fd309474350d0e93495c1e 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -451,16 +451,7 @@ void FramePainter::PaintTitleBar(views::NonClientFrameView* view,
   // The window icon is painted by its own views::View.
   views::WidgetDelegate* delegate = frame_->widget_delegate();
   if (delegate && delegate->ShouldShowWindowTitle()) {
-    int title_x = GetTitleOffsetX();
-    // Center the text in the middle of the caption - this way it adapts
-    // automatically to the caption height (which is given by the owner).
-    int title_y =
-        (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
-    gfx::Rect title_bounds(
-        title_x,
-        std::max(0, title_y),
-        std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
-        title_font.GetHeight());
+    gfx::Rect title_bounds = GetTitleBounds(view, title_font);
     canvas->DrawStringInt(delegate->GetWindowTitle(),
                           title_font,
                           kTitleTextColor,
@@ -533,6 +524,12 @@ void FramePainter::LayoutHeader(views::NonClientFrameView* view,
         gfx::Rect(kIconOffsetX, kIconOffsetY, kIconSize, kIconSize));
 }
 
+void FramePainter::SchedulePaintForTitle(views::NonClientFrameView* view,
+                                         const gfx::Font& title_font) {
+  frame_->non_client_view()->SchedulePaintInRect(
+      GetTitleBounds(view, title_font));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // aura::WindowObserver overrides:
 
@@ -736,4 +733,18 @@ void FramePainter::SchedulePaintForHeader() {
                 std::max(top_left_height, top_right_height)));
 }
 
+gfx::Rect FramePainter::GetTitleBounds(views::NonClientFrameView* view,
+                                       const gfx::Font& title_font) {
+  int title_x = GetTitleOffsetX();
+  // Center the text in the middle of the caption - this way it adapts
+  // automatically to the caption height (which is given by the owner).
+  int title_y =
+      (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
+  return gfx::Rect(
+      title_x,
+      std::max(0, title_y),
+      std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
+      title_font.GetHeight());
+}
+
 }  // namespace ash