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

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 years, 3 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) 2011 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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "content/browser/ssl/ssl_host_state.h" 55 #include "content/browser/ssl/ssl_host_state.h"
56 #include "content/browser/tab_contents/tab_contents.h" 56 #include "content/browser/tab_contents/tab_contents.h"
57 #include "content/browser/webui/web_ui.h" 57 #include "content/browser/webui/web_ui.h"
58 #include "content/common/notification_service.h" 58 #include "content/common/notification_service.h"
59 #include "grit/locale_settings.h" 59 #include "grit/locale_settings.h"
60 #include "net/base/transport_security_state.h" 60 #include "net/base/transport_security_state.h"
61 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
62 #include "webkit/database/database_tracker.h" 62 #include "webkit/database/database_tracker.h"
63 #include "webkit/quota/quota_manager.h" 63 #include "webkit/quota/quota_manager.h"
64 64
65 #if defined(TOOLKIT_USES_GTK) 65 #if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
66 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 66 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
67 #endif 67 #endif
68 68
69 #if defined(OS_CHROMEOS) 69 #if defined(OS_CHROMEOS)
70 #include "chrome/browser/chromeos/preferences.h" 70 #include "chrome/browser/chromeos/preferences.h"
71 #endif 71 #endif
72 72
73 using base::Time; 73 using base::Time;
74 using base::TimeDelta; 74 using base::TimeDelta;
75 75
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 PrefService::UNSYNCABLE_PREF); 133 PrefService::UNSYNCABLE_PREF);
134 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, 134 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck,
135 true, 135 true,
136 PrefService::SYNCABLE_PREF); 136 PrefService::SYNCABLE_PREF);
137 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, 137 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect,
138 true, 138 true,
139 PrefService::UNSYNCABLE_PREF); 139 PrefService::UNSYNCABLE_PREF);
140 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, 140 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults,
141 true, 141 true,
142 PrefService::UNSYNCABLE_PREF); 142 PrefService::UNSYNCABLE_PREF);
143 #if defined(TOOLKIT_USES_GTK) 143 #if defined(TOOLKIT_USES_GTK) & !defined(USE_AURA)
144 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 144 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
145 GtkThemeService::DefaultUsesSystemTheme(), 145 GtkThemeService::DefaultUsesSystemTheme(),
146 PrefService::UNSYNCABLE_PREF); 146 PrefService::UNSYNCABLE_PREF);
147 #endif 147 #endif
148 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, 148 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
149 FilePath(), 149 FilePath(),
150 PrefService::UNSYNCABLE_PREF); 150 PrefService::UNSYNCABLE_PREF);
151 prefs->RegisterStringPref(prefs::kCurrentThemeID, 151 prefs->RegisterStringPref(prefs::kCurrentThemeID,
152 ThemeService::kDefaultThemeID, 152 ThemeService::kDefaultThemeID,
153 PrefService::UNSYNCABLE_PREF); 153 PrefService::UNSYNCABLE_PREF);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 return is_guest_session; 213 return is_guest_session;
214 #else 214 #else
215 return false; 215 return false;
216 #endif 216 #endif
217 } 217 }
218 218
219 bool Profile::IsSyncAccessible() { 219 bool Profile::IsSyncAccessible() {
220 ProfileSyncService* syncService = GetProfileSyncService(); 220 ProfileSyncService* syncService = GetProfileSyncService();
221 return syncService && !syncService->IsManaged(); 221 return syncService && !syncService->IsManaged();
222 } 222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698