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 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/ui/views/tab_icon_view.h" | 24 #include "chrome/browser/ui/views/tab_icon_view.h" |
25 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 25 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
26 #include "chrome/browser/ui/views/theme_image_mapper.h" | 26 #include "chrome/browser/ui/views/theme_image_mapper.h" |
27 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 27 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
28 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
29 #include "components/signin/core/common/profile_management_switches.h" | 29 #include "components/signin/core/common/profile_management_switches.h" |
30 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
31 #include "content/public/browser/web_contents.h" | 31 #include "content/public/browser/web_contents.h" |
32 #include "grit/generated_resources.h" | 32 #include "grit/generated_resources.h" |
33 #include "grit/theme_resources.h" | 33 #include "grit/theme_resources.h" |
34 #include "grit/ui_resources.h" | |
35 #include "ui/accessibility/ax_view_state.h" | 34 #include "ui/accessibility/ax_view_state.h" |
36 #include "ui/base/hit_test.h" | 35 #include "ui/base/hit_test.h" |
37 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
38 #include "ui/base/resource/resource_bundle.h" | 37 #include "ui/base/resource/resource_bundle.h" |
39 #include "ui/base/theme_provider.h" | 38 #include "ui/base/theme_provider.h" |
40 #include "ui/gfx/canvas.h" | 39 #include "ui/gfx/canvas.h" |
41 #include "ui/gfx/font_list.h" | 40 #include "ui/gfx/font_list.h" |
42 #include "ui/gfx/image/image.h" | 41 #include "ui/gfx/image/image.h" |
43 #include "ui/gfx/image/image_skia.h" | 42 #include "ui/gfx/image/image_skia.h" |
44 #include "ui/gfx/path.h" | 43 #include "ui/gfx/path.h" |
45 #include "ui/gfx/rect_conversions.h" | 44 #include "ui/gfx/rect_conversions.h" |
| 45 #include "ui/resources/grit/ui_resources.h" |
46 #include "ui/views/controls/button/image_button.h" | 46 #include "ui/views/controls/button/image_button.h" |
47 #include "ui/views/controls/image_view.h" | 47 #include "ui/views/controls/image_view.h" |
48 #include "ui/views/controls/label.h" | 48 #include "ui/views/controls/label.h" |
49 #include "ui/views/layout/layout_constants.h" | 49 #include "ui/views/layout/layout_constants.h" |
50 #include "ui/views/views_delegate.h" | 50 #include "ui/views/views_delegate.h" |
51 #include "ui/views/widget/root_view.h" | 51 #include "ui/views/widget/root_view.h" |
52 #include "ui/views/window/frame_background.h" | 52 #include "ui/views/window/frame_background.h" |
53 #include "ui/views/window/window_shape.h" | 53 #include "ui/views/window/window_shape.h" |
54 | 54 |
55 #if defined(OS_LINUX) | 55 #if defined(OS_LINUX) |
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
904 | 904 |
905 int OpaqueBrowserFrameView::GetTopAreaHeight() const { | 905 int OpaqueBrowserFrameView::GetTopAreaHeight() const { |
906 gfx::ImageSkia* frame_image = GetFrameImage(); | 906 gfx::ImageSkia* frame_image = GetFrameImage(); |
907 int top_area_height = frame_image->height(); | 907 int top_area_height = frame_image->height(); |
908 if (browser_view()->IsTabStripVisible()) { | 908 if (browser_view()->IsTabStripVisible()) { |
909 top_area_height = std::max(top_area_height, | 909 top_area_height = std::max(top_area_height, |
910 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); | 910 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); |
911 } | 911 } |
912 return top_area_height; | 912 return top_area_height; |
913 } | 913 } |
OLD | NEW |