| 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 14 matching lines...) Expand all Loading... |
| 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/chromium_strings.h" | 32 #include "grit/chromium_strings.h" |
| 33 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
| 34 #include "grit/theme_resources.h" | 34 #include "grit/theme_resources.h" |
| 35 #include "grit/ui_resources.h" | |
| 36 #include "ui/accessibility/ax_view_state.h" | 35 #include "ui/accessibility/ax_view_state.h" |
| 37 #include "ui/base/hit_test.h" | 36 #include "ui/base/hit_test.h" |
| 38 #include "ui/base/l10n/l10n_util.h" | 37 #include "ui/base/l10n/l10n_util.h" |
| 39 #include "ui/base/resource/resource_bundle.h" | 38 #include "ui/base/resource/resource_bundle.h" |
| 40 #include "ui/base/theme_provider.h" | 39 #include "ui/base/theme_provider.h" |
| 41 #include "ui/gfx/canvas.h" | 40 #include "ui/gfx/canvas.h" |
| 42 #include "ui/gfx/font_list.h" | 41 #include "ui/gfx/font_list.h" |
| 43 #include "ui/gfx/image/image.h" | 42 #include "ui/gfx/image/image.h" |
| 44 #include "ui/gfx/image/image_skia.h" | 43 #include "ui/gfx/image/image_skia.h" |
| 45 #include "ui/gfx/path.h" | 44 #include "ui/gfx/path.h" |
| 46 #include "ui/gfx/rect_conversions.h" | 45 #include "ui/gfx/rect_conversions.h" |
| 46 #include "ui/resources/grit/ui_resources.h" |
| 47 #include "ui/views/controls/button/image_button.h" | 47 #include "ui/views/controls/button/image_button.h" |
| 48 #include "ui/views/controls/image_view.h" | 48 #include "ui/views/controls/image_view.h" |
| 49 #include "ui/views/controls/label.h" | 49 #include "ui/views/controls/label.h" |
| 50 #include "ui/views/layout/layout_constants.h" | 50 #include "ui/views/layout/layout_constants.h" |
| 51 #include "ui/views/views_delegate.h" | 51 #include "ui/views/views_delegate.h" |
| 52 #include "ui/views/widget/root_view.h" | 52 #include "ui/views/widget/root_view.h" |
| 53 #include "ui/views/window/frame_background.h" | 53 #include "ui/views/window/frame_background.h" |
| 54 #include "ui/views/window/window_shape.h" | 54 #include "ui/views/window/window_shape.h" |
| 55 | 55 |
| 56 #if defined(OS_LINUX) | 56 #if defined(OS_LINUX) |
| (...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 | 905 |
| 906 int OpaqueBrowserFrameView::GetTopAreaHeight() const { | 906 int OpaqueBrowserFrameView::GetTopAreaHeight() const { |
| 907 gfx::ImageSkia* frame_image = GetFrameImage(); | 907 gfx::ImageSkia* frame_image = GetFrameImage(); |
| 908 int top_area_height = frame_image->height(); | 908 int top_area_height = frame_image->height(); |
| 909 if (browser_view()->IsTabStripVisible()) { | 909 if (browser_view()->IsTabStripVisible()) { |
| 910 top_area_height = std::max(top_area_height, | 910 top_area_height = std::max(top_area_height, |
| 911 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); | 911 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); |
| 912 } | 912 } |
| 913 return top_area_height; | 913 return top_area_height; |
| 914 } | 914 } |
| OLD | NEW |