Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/browser/sync/glue/theme_util.cc

Issue 6122006: Cleanup: Remove unneeded includes of pref_names.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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
OLDNEW
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/sync/glue/theme_util.h" 5 #include "chrome/browser/sync/glue/theme_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
11 #include "chrome/browser/extensions/extension_install_ui.h" 11 #include "chrome/browser/extensions/extension_install_ui.h"
12 #include "chrome/browser/extensions/extension_updater.h" 12 #include "chrome/browser/extensions/extension_updater.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #if defined(TOOLKIT_USES_GTK) 14 #if defined(TOOLKIT_USES_GTK)
15 #include "chrome/browser/gtk/gtk_theme_provider.h" 15 #include "chrome/browser/gtk/gtk_theme_provider.h"
16 #endif 16 #endif
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/sync/protocol/theme_specifics.pb.h" 19 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/extension_constants.h" 21 #include "chrome/common/extensions/extension_constants.h"
22 #include "chrome/common/pref_names.h"
23 #include "googleurl/src/gurl.h" 22 #include "googleurl/src/gurl.h"
24 23
25 namespace browser_sync { 24 namespace browser_sync {
26 25
27 const char kCurrentThemeClientTag[] = "current_theme"; 26 const char kCurrentThemeClientTag[] = "current_theme";
28 27
29 namespace { 28 namespace {
30 29
31 bool IsSystemThemeDistinctFromDefaultTheme() { 30 bool IsSystemThemeDistinctFromDefaultTheme() {
32 #if defined(TOOLKIT_USES_GTK) 31 #if defined(TOOLKIT_USES_GTK)
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 const sync_pb::ThemeSpecifics& theme_specifics, Profile* profile) { 218 const sync_pb::ThemeSpecifics& theme_specifics, Profile* profile) {
220 DCHECK(profile); 219 DCHECK(profile);
221 sync_pb::ThemeSpecifics old_theme_specifics; 220 sync_pb::ThemeSpecifics old_theme_specifics;
222 GetThemeSpecificsFromCurrentTheme(profile, &old_theme_specifics); 221 GetThemeSpecificsFromCurrentTheme(profile, &old_theme_specifics);
223 if (!AreThemeSpecificsEqual(old_theme_specifics, theme_specifics)) { 222 if (!AreThemeSpecificsEqual(old_theme_specifics, theme_specifics)) {
224 SetCurrentThemeFromThemeSpecifics(theme_specifics, profile); 223 SetCurrentThemeFromThemeSpecifics(theme_specifics, profile);
225 } 224 }
226 } 225 }
227 226
228 } // namespace browser_sync 227 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/autofill_model_associator.cc ('k') | chrome/browser/sync/profile_sync_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698