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

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: Still a few linking errors to resolve. 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 PrefService::UNSYNCABLE_PREF); 138 PrefService::UNSYNCABLE_PREF);
139 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, 139 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck,
140 true, 140 true,
141 PrefService::SYNCABLE_PREF); 141 PrefService::SYNCABLE_PREF);
142 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, 142 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect,
143 true, 143 true,
144 PrefService::UNSYNCABLE_PREF); 144 PrefService::UNSYNCABLE_PREF);
145 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, 145 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults,
146 true, 146 true,
147 PrefService::UNSYNCABLE_PREF); 147 PrefService::UNSYNCABLE_PREF);
148 #if defined(TOOLKIT_USES_GTK) 148 #if defined(TOOLKIT_USES_GTK) & !defined(USE_AURA)
149 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 149 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
150 GtkThemeService::DefaultUsesSystemTheme(), 150 GtkThemeService::DefaultUsesSystemTheme(),
151 PrefService::UNSYNCABLE_PREF); 151 PrefService::UNSYNCABLE_PREF);
152 #endif 152 #endif
153 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, 153 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
154 FilePath(), 154 FilePath(),
155 PrefService::UNSYNCABLE_PREF); 155 PrefService::UNSYNCABLE_PREF);
156 prefs->RegisterStringPref(prefs::kCurrentThemeID, 156 prefs->RegisterStringPref(prefs::kCurrentThemeID,
157 ThemeService::kDefaultThemeID, 157 ThemeService::kDefaultThemeID,
158 PrefService::UNSYNCABLE_PREF); 158 PrefService::UNSYNCABLE_PREF);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 } 222 }
223 223
224 bool Profile::IsSyncAccessible() { 224 bool Profile::IsSyncAccessible() {
225 ProfileSyncService* syncService = GetProfileSyncService(); 225 ProfileSyncService* syncService = GetProfileSyncService();
226 return syncService && !syncService->IsManaged(); 226 return syncService && !syncService->IsManaged();
227 } 227 }
228 228
229 chrome_browser_net::Predictor* Profile::GetNetworkPredictor() { 229 chrome_browser_net::Predictor* Profile::GetNetworkPredictor() {
230 return NULL; 230 return NULL;
231 } 231 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698