chrome/browser/themes/theme_service_unittest.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_unittest.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_factory.cc ('k') | chrome/browser/themes/theme_syncable_service.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/files/file_util.h"	7 #include "base/files/file_util.h"

	8 #include "base/macros.h"

8 #include "base/path_service.h"	9 #include "base/path_service.h"

	10 #include "build/build_config.h"

9 #include "chrome/browser/chrome_notification_types.h"	11 #include "chrome/browser/chrome_notification_types.h"

10 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

11 #include "chrome/browser/extensions/extension_service_test_base.h"	13 #include "chrome/browser/extensions/extension_service_test_base.h"

12 #include "chrome/browser/extensions/unpacked_installer.h"	14 #include "chrome/browser/extensions/unpacked_installer.h"

13 #include "chrome/browser/themes/custom_theme_supplier.h"	15 #include "chrome/browser/themes/custom_theme_supplier.h"

14 #include "chrome/browser/themes/theme_properties.h"	16 #include "chrome/browser/themes/theme_properties.h"

15 #include "chrome/browser/themes/theme_service_factory.h"	17 #include "chrome/browser/themes/theme_service_factory.h"

16 #include "chrome/common/chrome_paths.h"	18 #include "chrome/common/chrome_paths.h"

17 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

18 #include "chrome/test/base/testing_browser_process.h"	20 #include "chrome/test/base/testing_browser_process.h"

(...skipping 349 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
368 theme_service->UseDefaultTheme();	370 theme_service->UseDefaultTheme();

369 EXPECT_TRUE(theme_service->UsingDefaultTheme());	371 EXPECT_TRUE(theme_service->UsingDefaultTheme());

370 EXPECT_TRUE(get_theme_supplier(theme_service));	372 EXPECT_TRUE(get_theme_supplier(theme_service));

371 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),	373 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),

372 CustomThemeSupplier::SUPERVISED_USER_THEME);	374 CustomThemeSupplier::SUPERVISED_USER_THEME);

373 }	375 }

374 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)	376 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)

375 #endif // defined(ENABLE_SUPERVISED_USERS)	377 #endif // defined(ENABLE_SUPERVISED_USERS)

376	378

377 }; // namespace theme_service_internal	379 }; // namespace theme_service_internal

OLD	NEW