| 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 "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "content/public/browser/notification_service.h" | 29 #include "content/public/browser/notification_service.h" |
| 30 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
| 31 #include "grit/theme_resources.h" | 31 #include "grit/theme_resources.h" |
| 32 #include "ui/accessibility/ax_view_state.h" | 32 #include "ui/accessibility/ax_view_state.h" |
| 33 #include "ui/base/hit_test.h" | 33 #include "ui/base/hit_test.h" |
| 34 #include "ui/base/l10n/l10n_util.h" | 34 #include "ui/base/l10n/l10n_util.h" |
| 35 #include "ui/base/resource/resource_bundle.h" | 35 #include "ui/base/resource/resource_bundle.h" |
| 36 #include "ui/base/theme_provider.h" | 36 #include "ui/base/theme_provider.h" |
| 37 #include "ui/gfx/canvas.h" | 37 #include "ui/gfx/canvas.h" |
| 38 #include "ui/gfx/font_list.h" | 38 #include "ui/gfx/font_list.h" |
| 39 #include "ui/gfx/geometry/rect_conversions.h" |
| 39 #include "ui/gfx/image/image.h" | 40 #include "ui/gfx/image/image.h" |
| 40 #include "ui/gfx/image/image_skia.h" | 41 #include "ui/gfx/image/image_skia.h" |
| 41 #include "ui/gfx/path.h" | 42 #include "ui/gfx/path.h" |
| 42 #include "ui/gfx/rect_conversions.h" | |
| 43 #include "ui/resources/grit/ui_resources.h" | 43 #include "ui/resources/grit/ui_resources.h" |
| 44 #include "ui/views/controls/button/image_button.h" | 44 #include "ui/views/controls/button/image_button.h" |
| 45 #include "ui/views/controls/image_view.h" | 45 #include "ui/views/controls/image_view.h" |
| 46 #include "ui/views/controls/label.h" | 46 #include "ui/views/controls/label.h" |
| 47 #include "ui/views/layout/layout_constants.h" | 47 #include "ui/views/layout/layout_constants.h" |
| 48 #include "ui/views/views_delegate.h" | 48 #include "ui/views/views_delegate.h" |
| 49 #include "ui/views/widget/root_view.h" | 49 #include "ui/views/widget/root_view.h" |
| 50 #include "ui/views/window/frame_background.h" | 50 #include "ui/views/window/frame_background.h" |
| 51 #include "ui/views/window/window_shape.h" | 51 #include "ui/views/window/window_shape.h" |
| 52 | 52 |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 | 924 |
| 925 int OpaqueBrowserFrameView::GetTopAreaHeight() const { | 925 int OpaqueBrowserFrameView::GetTopAreaHeight() const { |
| 926 gfx::ImageSkia* frame_image = GetFrameImage(); | 926 gfx::ImageSkia* frame_image = GetFrameImage(); |
| 927 int top_area_height = frame_image->height(); | 927 int top_area_height = frame_image->height(); |
| 928 if (browser_view()->IsTabStripVisible()) { | 928 if (browser_view()->IsTabStripVisible()) { |
| 929 top_area_height = std::max(top_area_height, | 929 top_area_height = std::max(top_area_height, |
| 930 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); | 930 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); |
| 931 } | 931 } |
| 932 return top_area_height; | 932 return top_area_height; |
| 933 } | 933 } |
| OLD | NEW |