OLD | NEW |
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 Loading... |
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 Loading... |
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 |
OLD | NEW |