chrome/browser/views/frame/opaque_browser_frame_view.cc - Issue 3173043: Move theme files in chrome/browser/ into a themes/ subdir.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3173043: Move theme files in chrome/browser/ into a themes/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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

« chrome/browser/cocoa/bookmark_bar_folder_controller.mm ('K') | « chrome/browser/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/views/notifications/balloon_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

11 #include "chrome/browser/browser_theme_provider.h"

12 #include "chrome/browser/tab_contents/tab_contents.h"	11 #include "chrome/browser/tab_contents/tab_contents.h"

	12 #include "chrome/browser/themes/browser_theme_provider.h"

13 #include "chrome/browser/views/frame/browser_frame.h"	13 #include "chrome/browser/views/frame/browser_frame.h"

14 #include "chrome/browser/views/frame/browser_view.h"	14 #include "chrome/browser/views/frame/browser_view.h"

15 #include "chrome/browser/views/tabs/tab_strip.h"	15 #include "chrome/browser/views/tabs/tab_strip.h"

16 #include "chrome/browser/views/toolbar_view.h"	16 #include "chrome/browser/views/toolbar_view.h"

17 #include "gfx/canvas_skia.h"	17 #include "gfx/canvas_skia.h"

18 #include "gfx/font.h"	18 #include "gfx/font.h"

19 #include "gfx/path.h"	19 #include "gfx/path.h"

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

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

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

(...skipping 995 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1018 }	1018 }

1019	1019

1020 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,	1020 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,

1021 int height) const {	1021 int height) const {

1022 int top_height = NonClientTopBorderHeight(false, false);	1022 int top_height = NonClientTopBorderHeight(false, false);

1023 int border_thickness = NonClientBorderThickness();	1023 int border_thickness = NonClientBorderThickness();

1024 return gfx::Rect(border_thickness, top_height,	1024 return gfx::Rect(border_thickness, top_height,

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

1026 std::max(0, height - top_height - border_thickness));	1026 std::max(0, height - top_height - border_thickness));

1027 }	1027 }

OLD	NEW