Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Issue 8497067: views: Remove the old views/window/ directory and its stubbed files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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"
(...skipping 18 matching lines...) Expand all
29 #include "grit/ui_resources.h" 29 #include "grit/ui_resources.h"
30 #include "ui/base/accessibility/accessible_view_state.h" 30 #include "ui/base/accessibility/accessible_view_state.h"
31 #include "ui/base/hit_test.h" 31 #include "ui/base/hit_test.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 #include "ui/base/theme_provider.h" 34 #include "ui/base/theme_provider.h"
35 #include "ui/gfx/canvas_skia.h" 35 #include "ui/gfx/canvas_skia.h"
36 #include "ui/gfx/font.h" 36 #include "ui/gfx/font.h"
37 #include "ui/gfx/image/image.h" 37 #include "ui/gfx/image/image.h"
38 #include "ui/gfx/path.h" 38 #include "ui/gfx/path.h"
39 #include "ui/views/window/window_shape.h"
39 #include "views/controls/button/image_button.h" 40 #include "views/controls/button/image_button.h"
40 #include "views/controls/image_view.h" 41 #include "views/controls/image_view.h"
41 #include "views/widget/root_view.h" 42 #include "views/widget/root_view.h"
42 #include "views/window/window_shape.h"
43 43
44 #if defined(USE_VIRTUAL_KEYBOARD) 44 #if defined(USE_VIRTUAL_KEYBOARD)
45 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h" 45 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
46 #endif 46 #endif
47 47
48 namespace { 48 namespace {
49 // The frame border is only visible in restored mode and is hardcoded to 4 px on 49 // The frame border is only visible in restored mode and is hardcoded to 4 px on
50 // each side regardless of the system window border size. 50 // each side regardless of the system window border size.
51 const int kFrameBorderThickness = 4; 51 const int kFrameBorderThickness = 4;
52 // Besides the frame border, there's another 11 px of empty space atop the 52 // Besides the frame border, there's another 11 px of empty space atop the
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 1136
1137 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width, 1137 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
1138 int height) const { 1138 int height) const {
1139 int top_height = NonClientTopBorderHeight(false); 1139 int top_height = NonClientTopBorderHeight(false);
1140 int border_thickness = NonClientBorderThickness(); 1140 int border_thickness = NonClientBorderThickness();
1141 return gfx::Rect(border_thickness, top_height, 1141 return gfx::Rect(border_thickness, top_height,
1142 std::max(0, width - (2 * border_thickness)), 1142 std::max(0, width - (2 * border_thickness)),
1143 std::max(0, height - GetReservedHeight() - 1143 std::max(0, height - GetReservedHeight() -
1144 top_height - border_thickness)); 1144 top_height - border_thickness));
1145 } 1145 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.h ('k') | chrome/browser/ui/views/hung_renderer_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698