chrome/browser/views/toolbar_view.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ 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/toolbar_view.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ 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

« no previous file with comments | « chrome/browser/views/toolbar_view.h ('k') | chrome/browser/views/update_recommended_message_box.cc » ('j') | chrome/chrome_browser.gypi » ('J')

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/toolbar_view.h"	5 #include "chrome/browser/views/toolbar_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 "chrome/app/chrome_dll_resource.h"	9 #include "chrome/app/chrome_dll_resource.h"

10 #include "chrome/browser/browser.h"	10 #include "chrome/browser/browser.h"

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

12 #include "chrome/browser/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

13 #include "chrome/browser/profile.h"	13 #include "chrome/browser/profile.h"

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

15 #include "chrome/browser/upgrade_detector.h"	15 #include "chrome/browser/upgrade_detector.h"

16 #include "chrome/browser/view_ids.h"	16 #include "chrome/browser/view_ids.h"

17 #include "chrome/browser/views/browser_actions_container.h"	17 #include "chrome/browser/views/browser_actions_container.h"

18 #include "chrome/browser/views/event_utils.h"	18 #include "chrome/browser/views/event_utils.h"

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

20 #include "chrome/browser/views/wrench_menu.h"	20 #include "chrome/browser/views/wrench_menu.h"

21 #include "chrome/browser/wrench_menu_model.h"	21 #include "chrome/browser/wrench_menu_model.h"

22 #include "chrome/common/notification_service.h"	22 #include "chrome/common/notification_service.h"

(...skipping 614 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
637 *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),	637 *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),

638 value);	638 value);

639 }	639 }

640	640

641 static const int kBadgeLeftSpacing = 8;	641 static const int kBadgeLeftSpacing = 8;

642 static const int kBadgeTopSpacing = 18;	642 static const int kBadgeTopSpacing = 18;

643 canvas->DrawBitmapInt(badge, kBadgeLeftSpacing, kBadgeTopSpacing);	643 canvas->DrawBitmapInt(badge, kBadgeLeftSpacing, kBadgeTopSpacing);

644	644

645 return canvas->ExtractBitmap();	645 return canvas->ExtractBitmap();

646 }	646 }

OLD	NEW