chrome/browser/views/frame/opaque_browser_frame_view.cc - Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/.

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 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 9 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/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/views/fullscreen_exit_bubble.cc » ('j') | no next file with comments »

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/gfx/canvas.h"

8 #include "app/gfx/font.h"

9 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

10 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

11 #include "app/theme_provider.h"	9 #include "app/theme_provider.h"

12 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

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

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

15 #include "chrome/browser/views/frame/browser_extender.h"	13 #include "chrome/browser/views/frame/browser_extender.h"

16 #include "chrome/browser/views/frame/browser_frame.h"	14 #include "chrome/browser/views/frame/browser_frame.h"

17 #include "chrome/browser/views/frame/browser_view.h"	15 #include "chrome/browser/views/frame/browser_view.h"

18 #include "chrome/browser/views/tabs/tab_strip.h"	16 #include "chrome/browser/views/tabs/tab_strip.h"

	17 #include "gfx/canvas.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"

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

24 #include "views/controls/button/image_button.h"	24 #include "views/controls/button/image_button.h"

25 #include "views/controls/image_view.h"	25 #include "views/controls/image_view.h"

26 #include "views/widget/root_view.h"	26 #include "views/widget/root_view.h"

27 #include "views/window/window.h"	27 #include "views/window/window.h"

28 #include "views/window/window_resources.h"	28 #include "views/window/window_resources.h"

(...skipping 985 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1014 void OpaqueBrowserFrameView::InitClass() {	1014 void OpaqueBrowserFrameView::InitClass() {

1015 static bool initialized = false;	1015 static bool initialized = false;

1016 if (!initialized) {	1016 if (!initialized) {

1017 #if defined(GOOGLE_CHROME_BUILD)	1017 #if defined(GOOGLE_CHROME_BUILD)

1018 distributor_logo_ = ResourceBundle::GetSharedInstance().	1018 distributor_logo_ = ResourceBundle::GetSharedInstance().

1019 GetBitmapNamed(IDR_DISTRIBUTOR_LOGO_LIGHT);	1019 GetBitmapNamed(IDR_DISTRIBUTOR_LOGO_LIGHT);

1020 #endif	1020 #endif

1021 initialized = true;	1021 initialized = true;

1022 }	1022 }

1023 }	1023 }

OLD	NEW