| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 } | 89 } |
| 90 | 90 |
| 91 void ActivityFrameView::Layout() { | 91 void ActivityFrameView::Layout() { |
| 92 title_->SetBounds(0, 0, width(), NonClientTopBorderHeight()); | 92 title_->SetBounds(0, 0, width(), NonClientTopBorderHeight()); |
| 93 } | 93 } |
| 94 | 94 |
| 95 //////////////////////////////////////////////////////////////////////////////// | 95 //////////////////////////////////////////////////////////////////////////////// |
| 96 // ActivityFrameView, private: | 96 // ActivityFrameView, private: |
| 97 | 97 |
| 98 int ActivityFrameView::NonClientTopBorderHeight() const { | 98 int ActivityFrameView::NonClientTopBorderHeight() const { |
| 99 return frame_->IsFullscreen() ? 0 : title_->GetPreferredSize().height(); | 99 const int kDefaultTitleHeight = 25; |
| 100 return frame_->IsFullscreen() ? 0 : kDefaultTitleHeight; |
| 100 } | 101 } |
| 101 | 102 |
| 102 } // namespace ash | 103 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 455773003:
athena: Show the theme-color in the title strip, and fix the height. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src