OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/wm/custom_frame_view_ash.h" | 5 #include "ash/wm/custom_frame_view_ash.h" |
6 | 6 |
7 #include "ash/wm/frame_painter.h" | 7 #include "ash/wm/frame_painter.h" |
8 #include "ash/wm/workspace/frame_maximize_button.h" | 8 #include "ash/wm/workspace/frame_maximize_button.h" |
9 #include "grit/ash_resources.h" | 9 #include "grit/ash_resources.h" |
10 #include "grit/ui_strings.h" // Accessibility names | 10 #include "grit/ui_strings.h" // Accessibility names |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 ui::LayerAnimator::set_slow_animation_mode(false); | 170 ui::LayerAnimator::set_slow_animation_mode(false); |
171 } | 171 } |
172 | 172 |
173 //////////////////////////////////////////////////////////////////////////////// | 173 //////////////////////////////////////////////////////////////////////////////// |
174 // CustomFrameViewAsh, private: | 174 // CustomFrameViewAsh, private: |
175 | 175 |
176 int CustomFrameViewAsh::NonClientTopBorderHeight() const { | 176 int CustomFrameViewAsh::NonClientTopBorderHeight() const { |
177 if (frame_->IsFullscreen()) | 177 if (frame_->IsFullscreen()) |
178 return 0; | 178 return 0; |
179 | 179 |
180 // Reserve enough space to see the buttons, including any offset from top and | 180 return frame_painter_->HeaderHeight(); |
181 // reserving space for the separator line. | |
182 return close_button_->bounds().bottom() + | |
183 frame_painter_->HeaderContentSeparatorSize(); | |
184 } | 181 } |
185 | 182 |
186 } // namespace ash | 183 } // namespace ash |
OLD | NEW |