chrome/browser/ui/views/frame/opaque_browser_frame_view.cc - Issue 6849030: Add support for multi resolution icons

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

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix try jobs Created 9 years, 8 months 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

« no previous file with comments | « chrome/browser/ui/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | skia/ext/skia_utils_mac.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/themes/theme_service.h"	9 #include "chrome/browser/themes/theme_service.h"

10 #include "chrome/browser/ui/views/frame/browser_frame.h"	10 #include "chrome/browser/ui/views/frame/browser_frame.h"

11 #include "chrome/browser/ui/views/frame/browser_view.h"	11 #include "chrome/browser/ui/views/frame/browser_view.h"

12 #include "chrome/browser/ui/views/tabs/tab_strip.h"	12 #include "chrome/browser/ui/views/tabs/tab_strip.h"

13 #include "chrome/browser/ui/views/toolbar_view.h"	13 #include "chrome/browser/ui/views/toolbar_view.h"

14 #include "content/browser/tab_contents/tab_contents.h"	14 #include "content/browser/tab_contents/tab_contents.h"

15 #include "grit/app_resources.h"	15 #include "grit/app_resources.h"

16 #include "grit/chromium_strings.h"	16 #include "grit/chromium_strings.h"

17 #include "grit/generated_resources.h"	17 #include "grit/generated_resources.h"

18 #include "grit/theme_resources.h"	18 #include "grit/theme_resources.h"

	19 #include "grit/theme_resources_standard.h"

19 #include "ui/base/accessibility/accessible_view_state.h"	20 #include "ui/base/accessibility/accessible_view_state.h"

20 #include "ui/base/l10n/l10n_util.h"	21 #include "ui/base/l10n/l10n_util.h"

21 #include "ui/base/resource/resource_bundle.h"	22 #include "ui/base/resource/resource_bundle.h"

22 #include "ui/base/theme_provider.h"	23 #include "ui/base/theme_provider.h"

23 #include "ui/gfx/canvas_skia.h"	24 #include "ui/gfx/canvas_skia.h"

24 #include "ui/gfx/font.h"	25 #include "ui/gfx/font.h"

25 #include "ui/gfx/path.h"	26 #include "ui/gfx/path.h"

26 #include "views/controls/button/image_button.h"	27 #include "views/controls/button/image_button.h"

27 #include "views/controls/image_view.h"	28 #include "views/controls/image_view.h"

28 #include "views/widget/root_view.h"	29 #include "views/widget/root_view.h"

(...skipping 1044 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1073	1074

1074 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,	1075 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,

1075 int height) const {	1076 int height) const {

1076 int top_height = NonClientTopBorderHeight(false, false);	1077 int top_height = NonClientTopBorderHeight(false, false);

1077 int border_thickness = NonClientBorderThickness();	1078 int border_thickness = NonClientBorderThickness();

1078 return gfx::Rect(border_thickness, top_height,	1079 return gfx::Rect(border_thickness, top_height,

1079 std::max(0, width - (2 * border_thickness)),	1080 std::max(0, width - (2 * border_thickness)),

1080 std::max(0, height - GetReservedHeight() -	1081 std::max(0, height - GetReservedHeight() -

1081 top_height - border_thickness));	1082 top_height - border_thickness));

1082 }	1083 }

OLD	NEW