diff options
| -rw-r--r-- | athena/activity/activity_frame_view.cc | 11 | ||||
| -rw-r--r-- | athena/activity/activity_view_manager_impl.cc | 4 | ||||
| -rw-r--r-- | athena/content/web_activity.cc | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/athena/activity/activity_frame_view.cc b/athena/activity/activity_frame_view.cc index 08aeb3d..83b9388 100644 --- a/athena/activity/activity_frame_view.cc +++ b/athena/activity/activity_frame_view.cc @@ -72,15 +72,18 @@ void ActivityFrameView::ResetWindowControls() { } void ActivityFrameView::UpdateWindowIcon() { -} - -void ActivityFrameView::UpdateWindowTitle() { if (!view_model_->UsesFrame()) return; SkColor bgcolor = view_model_->GetRepresentativeColor(); - title_->set_background(views::Background::CreateSolidBackground(bgcolor)); + set_background(views::Background::CreateSolidBackground(bgcolor)); title_->SetBackgroundColor(bgcolor); + SchedulePaint(); +} + +void ActivityFrameView::UpdateWindowTitle() { + if (!view_model_->UsesFrame()) + return; title_->SetText(frame_->widget_delegate()->GetWindowTitle()); } diff --git a/athena/activity/activity_view_manager_impl.cc b/athena/activity/activity_view_manager_impl.cc index 7f6eed8..76d40d4 100644 --- a/athena/activity/activity_view_manager_impl.cc +++ b/athena/activity/activity_view_manager_impl.cc @@ -74,8 +74,10 @@ class ActivityViewManagerImpl : public ActivityViewManager, 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: diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc index 4dca1c3..34a21d0 100644 --- a/athena/content/web_activity.cc +++ b/athena/content/web_activity.cc @@ -477,6 +477,7 @@ void WebActivity::DidUpdateFaviconURL( void WebActivity::DidChangeThemeColor(SkColor theme_color) { title_color_ = theme_color; + ActivityManager::Get()->UpdateActivity(this); } void WebActivity::MakeVisible() { |