chrome/browser/ui/views/frame/glass_browser_frame_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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/ui/views/frame/glass_browser_frame_view.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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

OLD	NEW
1 // Copyright (c) 2010 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/views/frame/glass_browser_frame_view.h"	5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"

6	6

7 #include "app/resource_bundle.h"	7 #include "app/resource_bundle.h"

8 #include "app/theme_provider.h"	8 #include "app/theme_provider.h"

9 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/app/chrome_dll_resource.h"	10 #include "chrome/app/chrome_dll_resource.h"

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

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

13 #include "chrome/browser/views/tabs/side_tab_strip.h"	13 #include "chrome/browser/ui/views/tabs/side_tab_strip.h"

14 #include "chrome/browser/views/tabs/tab.h"	14 #include "chrome/browser/ui/views/tabs/tab.h"

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

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

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

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

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

20 #include "views/window/client_view.h"	20 #include "views/window/client_view.h"

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

22	22

23 HICON GlassBrowserFrameView::throbber_icons_[	23 HICON GlassBrowserFrameView::throbber_icons_[

24 GlassBrowserFrameView::kThrobberIconCount];	24 GlassBrowserFrameView::kThrobberIconCount];

25	25

(...skipping 476 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
502 static bool initialized = false;	502 static bool initialized = false;

503 if (!initialized) {	503 if (!initialized) {

504 ResourceBundle &rb = ResourceBundle::GetSharedInstance();	504 ResourceBundle &rb = ResourceBundle::GetSharedInstance();

505 for (int i = 0; i < kThrobberIconCount; ++i) {	505 for (int i = 0; i < kThrobberIconCount; ++i) {

506 throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i);	506 throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i);

507 DCHECK(throbber_icons_[i]);	507 DCHECK(throbber_icons_[i]);

508 }	508 }

509 initialized = true;	509 initialized = true;

510 }	510 }

511 }	511 }

OLD	NEW