| 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/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
| 14 #include "chrome/browser/themes/theme_service.h" | 14 #include "chrome/browser/themes/theme_service.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/search/search.h" | 16 #include "chrome/browser/ui/search/search.h" |
| 17 #include "chrome/browser/ui/search/search_model.h" | 17 #include "chrome/browser/ui/search/search_model.h" |
| 18 #include "chrome/browser/ui/views/avatar_menu_button.h" | 18 #include "chrome/browser/ui/views/avatar_menu_button.h" |
| 19 #include "chrome/browser/ui/views/frame/browser_frame.h" | 19 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 20 #include "chrome/browser/ui/views/frame/browser_view.h" | 20 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 21 #include "chrome/browser/ui/views/tab_icon_view.h" |
| 21 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 22 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 22 #include "chrome/browser/ui/views/toolbar_view.h" | 23 #include "chrome/browser/ui/views/toolbar_view.h" |
| 23 #include "chrome/common/chrome_notification_types.h" | 24 #include "chrome/common/chrome_notification_types.h" |
| 24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
| 25 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
| 26 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
| 27 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
| 28 #include "grit/chromium_strings.h" | 29 #include "grit/chromium_strings.h" |
| 29 #include "grit/generated_resources.h" | 30 #include "grit/generated_resources.h" |
| 30 #include "grit/theme_resources.h" | 31 #include "grit/theme_resources.h" |
| 31 #include "grit/ui_resources.h" | 32 #include "grit/ui_resources.h" |
| 32 #include "ui/base/accessibility/accessible_view_state.h" | 33 #include "ui/base/accessibility/accessible_view_state.h" |
| 33 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
| 34 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
| 35 #include "ui/base/resource/resource_bundle.h" | 36 #include "ui/base/resource/resource_bundle.h" |
| 36 #include "ui/base/theme_provider.h" | 37 #include "ui/base/theme_provider.h" |
| 37 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
| 38 #include "ui/gfx/font.h" | 39 #include "ui/gfx/font.h" |
| 39 #include "ui/gfx/image/image.h" | 40 #include "ui/gfx/image/image.h" |
| 41 #include "ui/gfx/image/image_skia.h" |
| 40 #include "ui/gfx/path.h" | 42 #include "ui/gfx/path.h" |
| 41 #include "ui/views/controls/button/image_button.h" | 43 #include "ui/views/controls/button/image_button.h" |
| 42 #include "ui/views/controls/image_view.h" | 44 #include "ui/views/controls/image_view.h" |
| 43 #include "ui/views/widget/root_view.h" | 45 #include "ui/views/widget/root_view.h" |
| 44 #include "ui/views/window/frame_background.h" | 46 #include "ui/views/window/frame_background.h" |
| 45 #include "ui/views/window/window_shape.h" | 47 #include "ui/views/window/window_shape.h" |
| 46 | 48 |
| 47 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
| 48 #include "base/win/metro.h" | 50 #include "base/win/metro.h" |
| 49 #endif // OS_WIN | 51 #endif // OS_WIN |
| (...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1027 | 1029 |
| 1028 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, | 1030 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, |
| 1029 int height) const { | 1031 int height) const { |
| 1030 int top_height = NonClientTopBorderHeight(false); | 1032 int top_height = NonClientTopBorderHeight(false); |
| 1031 int border_thickness = NonClientBorderThickness(); | 1033 int border_thickness = NonClientBorderThickness(); |
| 1032 return gfx::Rect(border_thickness, top_height, | 1034 return gfx::Rect(border_thickness, top_height, |
| 1033 std::max(0, width - (2 * border_thickness)), | 1035 std::max(0, width - (2 * border_thickness)), |
| 1034 std::max(0, height - GetReservedHeight() - | 1036 std::max(0, height - GetReservedHeight() - |
| 1035 top_height - border_thickness)); | 1037 top_height - border_thickness)); |
| 1036 } | 1038 } |
| OLD | NEW |