Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: athena/activity/activity_frame_view.cc

Issue 549593002: athena: Make sure the window captions update correctly for theme-color. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | athena/activity/activity_view_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/activity/activity_frame_view.cc
diff --git a/athena/activity/activity_frame_view.cc b/athena/activity/activity_frame_view.cc
index 08aeb3d12fa6d651143d9389015a22162ee6e550..83b93885b5fcc64482e0c51d0bd3b55de8482d8d 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());
}
« no previous file with comments | « no previous file | athena/activity/activity_view_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698