| 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/ui_resources.h" | 9 #include "grit/ash_resources.h" |
| 10 #include "grit/ui_strings.h" // Accessibility names | 10 #include "grit/ui_strings.h" // Accessibility names |
| 11 #include "ui/base/l10n/l10n_util.h" | 11 #include "ui/base/l10n/l10n_util.h" |
| 12 #include "ui/base/resource/resource_bundle.h" | 12 #include "ui/base/resource/resource_bundle.h" |
| 13 #include "ui/compositor/layer_animator.h" | 13 #include "ui/compositor/layer_animator.h" |
| 14 #include "ui/gfx/font.h" | 14 #include "ui/gfx/font.h" |
| 15 #include "ui/gfx/image/image.h" | 15 #include "ui/gfx/image/image.h" |
| 16 #include "ui/gfx/rect.h" | 16 #include "ui/gfx/rect.h" |
| 17 #include "ui/gfx/size.h" | 17 #include "ui/gfx/size.h" |
| 18 #include "ui/views/controls/button/image_button.h" | 18 #include "ui/views/controls/button/image_button.h" |
| 19 #include "ui/views/widget/native_widget_aura.h" | 19 #include "ui/views/widget/native_widget_aura.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 // CustomFrameViewAsh, private: | 167 // CustomFrameViewAsh, private: |
| 168 | 168 |
| 169 int CustomFrameViewAsh::NonClientTopBorderHeight() const { | 169 int CustomFrameViewAsh::NonClientTopBorderHeight() const { |
| 170 // Reserve enough space to see the buttons, including any offset from top and | 170 // Reserve enough space to see the buttons, including any offset from top and |
| 171 // reserving space for the separator line. | 171 // reserving space for the separator line. |
| 172 return close_button_->bounds().bottom() + | 172 return close_button_->bounds().bottom() + |
| 173 frame_painter_->HeaderContentSeparatorSize(); | 173 frame_painter_->HeaderContentSeparatorSize(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 } // namespace ash | 176 } // namespace ash |
| OLD | NEW |