OLD | NEW |
---|---|
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/profile.h" | 5 #include "chrome/browser/profile.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 #endif | 89 #endif |
90 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, FilePath()); | 90 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, FilePath()); |
91 prefs->RegisterStringPref(prefs::kCurrentThemeID, | 91 prefs->RegisterStringPref(prefs::kCurrentThemeID, |
92 BrowserThemeProvider::kDefaultThemeID); | 92 BrowserThemeProvider::kDefaultThemeID); |
93 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages); | 93 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages); |
94 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors); | 94 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors); |
95 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints); | 95 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints); |
96 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties); | 96 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties); |
97 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); | 97 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); |
98 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, ""); | 98 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, ""); |
99 prefs->RegisterStringPref(prefs::kApplicationLocale, ""); | |
Nikita (slow)
2010/11/15 07:54:41
Please put it in the CHROME_OS ifdef with the TODO
Denis Lagno
2010/11/15 11:50:05
Done.
| |
99 } | 100 } |
100 | 101 |
101 // static | 102 // static |
102 URLRequestContextGetter* Profile::GetDefaultRequestContext() { | 103 URLRequestContextGetter* Profile::GetDefaultRequestContext() { |
103 return default_request_context_; | 104 return default_request_context_; |
104 } | 105 } |
105 | 106 |
106 bool Profile::IsSyncAccessible() { | 107 bool Profile::IsSyncAccessible() { |
107 ProfileSyncService* syncService = GetProfileSyncService(); | 108 ProfileSyncService* syncService = GetProfileSyncService(); |
108 return syncService && !syncService->IsManaged(); | 109 return syncService && !syncService->IsManaged(); |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
633 | 634 |
634 // The file_system context for this profile. | 635 // The file_system context for this profile. |
635 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; | 636 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; |
636 | 637 |
637 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); | 638 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); |
638 }; | 639 }; |
639 | 640 |
640 Profile* Profile::CreateOffTheRecordProfile() { | 641 Profile* Profile::CreateOffTheRecordProfile() { |
641 return new OffTheRecordProfileImpl(this); | 642 return new OffTheRecordProfileImpl(this); |
642 } | 643 } |
OLD | NEW |