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

athena/activity/activity_view_manager_impl.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/public/activity_view_manager.h"
 
 #include <algorithm>
 #include <map>
 
 #include "athena/activity/activity_widget_delegate.h"
@@ skipping 56 matching lines @@
     if (find != activity_widgets_.end()) {
       views::Widget* widget = find->second;
       widget->RemoveObserver(this);
       widget->Close();
       activity_widgets_.erase(activity);
     }
   }
 
   virtual void UpdateActivity(Activity* activity) OVERRIDE {
     ActivityWidgetMap::iterator find = activity_widgets_.find(activity);
-    if (find != activity_widgets_.end())
+    if (find != activity_widgets_.end()) {
+      find->second->UpdateWindowIcon();
       find->second->UpdateWindowTitle();
+    }
   }
 
   // views::WidgetObserver:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE {
     for (ActivityWidgetMap::iterator iter = activity_widgets_.begin();
          iter != activity_widgets_.end();
          ++iter) {
       if (iter->second == widget) {
         Activity::Delete(iter->first);
         break;
@@ skipping 19 matching lines @@
 ActivityViewManager* ActivityViewManager::Get() {
   return instance;
 }
 
 void ActivityViewManager::Shutdown() {
   CHECK(instance);
   delete instance;
 }
 
 }  // namespace athena