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/prefs/pref_service.h" |
12 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.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/views/avatar_menu_button.h" | 15 #include "chrome/browser/ui/views/avatar_menu_button.h" |
16 #include "chrome/browser/ui/views/frame/browser_frame.h" | 16 #include "chrome/browser/ui/views/frame/browser_frame.h" |
17 #include "chrome/browser/ui/views/frame/browser_view.h" | 17 #include "chrome/browser/ui/views/frame/browser_view.h" |
18 #include "chrome/browser/ui/views/tab_icon_view.h" | 18 #include "chrome/browser/ui/views/tab_icon_view.h" |
19 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 19 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
20 #include "chrome/browser/ui/views/toolbar_view.h" | 20 #include "chrome/browser/ui/views/toolbar_view.h" |
21 #include "chrome/common/chrome_notification_types.h" | 21 #include "chrome/common/chrome_notification_types.h" |
22 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1025 | 1025 |
1026 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, | 1026 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, |
1027 int height) const { | 1027 int height) const { |
1028 int top_height = NonClientTopBorderHeight(false); | 1028 int top_height = NonClientTopBorderHeight(false); |
1029 int border_thickness = NonClientBorderThickness(); | 1029 int border_thickness = NonClientBorderThickness(); |
1030 return gfx::Rect(border_thickness, top_height, | 1030 return gfx::Rect(border_thickness, top_height, |
1031 std::max(0, width - (2 * border_thickness)), | 1031 std::max(0, width - (2 * border_thickness)), |
1032 std::max(0, height - GetReservedHeight() - | 1032 std::max(0, height - GetReservedHeight() - |
1033 top_height - border_thickness)); | 1033 top_height - border_thickness)); |
1034 } | 1034 } |
OLD | NEW |