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

Side by Side Diff: athena/activity/activity_frame_view.cc

Issue 433083003: athena: Set a default background for the window title. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | athena/content/web_activity.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/activity_frame_view.h" 5 #include "athena/activity/activity_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "athena/activity/public/activity_view_model.h" 10 #include "athena/activity/public/activity_view_model.h"
(...skipping 12 matching lines...) Expand all
23 const char ActivityFrameView::kViewClassName[] = "ActivityFrameView"; 23 const char ActivityFrameView::kViewClassName[] = "ActivityFrameView";
24 24
25 ActivityFrameView::ActivityFrameView(views::Widget* frame, 25 ActivityFrameView::ActivityFrameView(views::Widget* frame,
26 ActivityViewModel* view_model) 26 ActivityViewModel* view_model)
27 : frame_(frame), view_model_(view_model), title_(new views::Label) { 27 : frame_(frame), view_model_(view_model), title_(new views::Label) {
28 title_->SetHorizontalAlignment(gfx::ALIGN_CENTER); 28 title_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
29 const gfx::FontList& font_list = title_->font_list(); 29 const gfx::FontList& font_list = title_->font_list();
30 title_->SetFontList(font_list.Derive(1, gfx::Font::BOLD)); 30 title_->SetFontList(font_list.Derive(1, gfx::Font::BOLD));
31 title_->SetEnabledColor(SK_ColorBLACK); 31 title_->SetEnabledColor(SK_ColorBLACK);
32 AddChildView(title_); 32 AddChildView(title_);
33 UpdateWindowTitle();
33 } 34 }
34 35
35 ActivityFrameView::~ActivityFrameView() { 36 ActivityFrameView::~ActivityFrameView() {
36 } 37 }
37 38
38 //////////////////////////////////////////////////////////////////////////////// 39 ////////////////////////////////////////////////////////////////////////////////
39 // ActivityFrameView, views::NonClientFrameView overrides: 40 // ActivityFrameView, views::NonClientFrameView overrides:
40 41
41 gfx::Rect ActivityFrameView::GetBoundsForClientView() const { 42 gfx::Rect ActivityFrameView::GetBoundsForClientView() const {
42 gfx::Rect client_bounds = bounds(); 43 gfx::Rect client_bounds = bounds();
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 93 }
93 94
94 //////////////////////////////////////////////////////////////////////////////// 95 ////////////////////////////////////////////////////////////////////////////////
95 // ActivityFrameView, private: 96 // ActivityFrameView, private:
96 97
97 int ActivityFrameView::NonClientTopBorderHeight() const { 98 int ActivityFrameView::NonClientTopBorderHeight() const {
98 return frame_->IsFullscreen() ? 0 : title_->GetPreferredSize().height(); 99 return frame_->IsFullscreen() ? 0 : title_->GetPreferredSize().height();
99 } 100 }
100 101
101 } // namespace ash 102 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | athena/content/web_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698