| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/frame/opaque_browser_frame_view.h" | 5 #include "chrome/browser/views/frame/opaque_browser_frame_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "app/theme_provider.h" | 9 #include "app/theme_provider.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1041 otr_y, otr_avatar_icon.width(), | 1041 otr_y, otr_avatar_icon.width(), |
| 1042 browser_view_->ShouldShowOffTheRecordAvatar() ? (otr_bottom - otr_y) : 0); | 1042 browser_view_->ShouldShowOffTheRecordAvatar() ? (otr_bottom - otr_y) : 0); |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, | 1045 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, |
| 1046 int height) const { | 1046 int height) const { |
| 1047 int top_height = NonClientTopBorderHeight(false, false); | 1047 int top_height = NonClientTopBorderHeight(false, false); |
| 1048 int border_thickness = NonClientBorderThickness(); | 1048 int border_thickness = NonClientBorderThickness(); |
| 1049 return gfx::Rect(border_thickness, top_height, | 1049 return gfx::Rect(border_thickness, top_height, |
| 1050 std::max(0, width - (2 * border_thickness)), | 1050 std::max(0, width - (2 * border_thickness)), |
| 1051 std::max(0, height - top_height - border_thickness)); | 1051 std::max(0, height - GetReservedHeight() - |
| 1052 top_height - border_thickness)); |
| 1052 } | 1053 } |
| OLD | NEW |