athena: Make sure the window captions update correctly for theme-color.

athena/activity/activity_frame_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/activity/activity_frame_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "athena/activity/public/activity_view_model.h"
@@ skipping 54 matching lines @@
 }
 
 void ActivityFrameView::GetWindowMask(const gfx::Size& size,
                                       gfx::Path* window_mask) {
 }
 
 void ActivityFrameView::ResetWindowControls() {
 }
 
 void ActivityFrameView::UpdateWindowIcon() {
+  if (!view_model_->UsesFrame())
+    return;
+
+  SkColor bgcolor = view_model_->GetRepresentativeColor();
+  set_background(views::Background::CreateSolidBackground(bgcolor));
+  title_->SetBackgroundColor(bgcolor);
+  SchedulePaint();
 }
 
 void ActivityFrameView::UpdateWindowTitle() {
   if (!view_model_->UsesFrame())
     return;
-
-  SkColor bgcolor = view_model_->GetRepresentativeColor();
-  title_->set_background(views::Background::CreateSolidBackground(bgcolor));
-  title_->SetBackgroundColor(bgcolor);
   title_->SetText(frame_->widget_delegate()->GetWindowTitle());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ActivityFrameView, views::View overrides:
 
 gfx::Size ActivityFrameView::GetPreferredSize() const {
   gfx::Size pref = frame_->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
   return frame_->non_client_view()
@@ skipping 11 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ActivityFrameView, private:
 
 int ActivityFrameView::NonClientTopBorderHeight() const {
   const int kDefaultTitleHeight = 25;
   return frame_->IsFullscreen() ? 0 : kDefaultTitleHeight;
 }
 
 }  // namespace ash