OLD | NEW |
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/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 2231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2242 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, | 2242 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, |
2243 false, | 2243 false, |
2244 PrefService::UNSYNCABLE_PREF); | 2244 PrefService::UNSYNCABLE_PREF); |
2245 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, | 2245 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, |
2246 -1, | 2246 -1, |
2247 PrefService::UNSYNCABLE_PREF); | 2247 PrefService::UNSYNCABLE_PREF); |
2248 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, | 2248 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, |
2249 PrefService::UNSYNCABLE_PREF); | 2249 PrefService::UNSYNCABLE_PREF); |
2250 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, | 2250 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, |
2251 PrefService::UNSYNCABLE_PREF); | 2251 PrefService::UNSYNCABLE_PREF); |
| 2252 prefs->RegisterBooleanPref(prefs::kImportBookmarks, |
| 2253 true, |
| 2254 PrefService::UNSYNCABLE_PREF); |
| 2255 prefs->RegisterBooleanPref(prefs::kImportHistory, |
| 2256 true, |
| 2257 PrefService::UNSYNCABLE_PREF); |
| 2258 prefs->RegisterBooleanPref(prefs::kImportHomepage, |
| 2259 true, |
| 2260 PrefService::UNSYNCABLE_PREF); |
| 2261 prefs->RegisterBooleanPref(prefs::kImportSearchEngine, |
| 2262 true, |
| 2263 PrefService::UNSYNCABLE_PREF); |
| 2264 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords, |
| 2265 true, |
| 2266 PrefService::UNSYNCABLE_PREF); |
| 2267 |
2252 // We need to register the type of these preferences in order to query | 2268 // We need to register the type of these preferences in order to query |
2253 // them even though they're only typically controlled via policy. | 2269 // them even though they're only typically controlled via policy. |
2254 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, | 2270 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, |
2255 false, | 2271 false, |
2256 PrefService::UNSYNCABLE_PREF); | 2272 PrefService::UNSYNCABLE_PREF); |
2257 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, | 2273 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, |
2258 false, | 2274 false, |
2259 PrefService::UNSYNCABLE_PREF); | 2275 PrefService::UNSYNCABLE_PREF); |
2260 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, | 2276 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, |
2261 false, | 2277 false, |
(...skipping 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4836 } | 4852 } |
4837 | 4853 |
4838 void Browser::ShowSyncSetup() { | 4854 void Browser::ShowSyncSetup() { |
4839 ProfileSyncService* service = | 4855 ProfileSyncService* service = |
4840 profile()->GetOriginalProfile()->GetProfileSyncService(); | 4856 profile()->GetOriginalProfile()->GetProfileSyncService(); |
4841 if (service->HasSyncSetupCompleted()) | 4857 if (service->HasSyncSetupCompleted()) |
4842 ShowOptionsTab(chrome::kSyncSetupSubPage); | 4858 ShowOptionsTab(chrome::kSyncSetupSubPage); |
4843 else | 4859 else |
4844 service->ShowLoginDialog(); | 4860 service->ShowLoginDialog(); |
4845 } | 4861 } |
OLD | NEW |