chrome/browser/themes/theme_service_browsertest.cc - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

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/themes/theme_service_browsertest.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 12 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/themes/theme_service_aurax11.cc ('k') | chrome/browser/themes/theme_service_factory.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/themes/theme_service.h"	5 #include "chrome/browser/themes/theme_service.h"

6	6

	7 #include "base/macros.h"

7 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/extensions/component_loader.h"	9 #include "chrome/browser/extensions/component_loader.h"

9 #include "chrome/browser/extensions/extension_browsertest.h"	10 #include "chrome/browser/extensions/extension_browsertest.h"

10 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/themes/theme_properties.h"	12 #include "chrome/browser/themes/theme_properties.h"

12 #include "chrome/browser/themes/theme_service_factory.h"	13 #include "chrome/browser/themes/theme_service_factory.h"

13 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

14 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

15	16

16 namespace {	17 namespace {

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 ThemeService* theme_service = ThemeServiceFactory::GetForProfile(	77 ThemeService* theme_service = ThemeServiceFactory::GetForProfile(

77 browser()->profile());	78 browser()->profile());

78 const ui::ThemeProvider& theme_provider =	79 const ui::ThemeProvider& theme_provider =

79 ThemeService::GetThemeProviderForProfile(browser()->profile());	80 ThemeService::GetThemeProviderForProfile(browser()->profile());

80 EXPECT_TRUE(UsingCustomTheme(*theme_service));	81 EXPECT_TRUE(UsingCustomTheme(*theme_service));

81 EXPECT_EQ(kThemeToolbarColor,	82 EXPECT_EQ(kThemeToolbarColor,

82 theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));	83 theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));

83 }	84 }

84	85

85 } // namespace	86 } // namespace

OLD	NEW