| 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 2233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, | 2244 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, |
| 2245 true, | 2245 true, |
| 2246 PrefService::UNSYNCABLE_PREF); | 2246 PrefService::UNSYNCABLE_PREF); |
| 2247 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, | 2247 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, |
| 2248 -1, | 2248 -1, |
| 2249 PrefService::UNSYNCABLE_PREF); | 2249 PrefService::UNSYNCABLE_PREF); |
| 2250 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, | 2250 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, |
| 2251 PrefService::UNSYNCABLE_PREF); | 2251 PrefService::UNSYNCABLE_PREF); |
| 2252 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, | 2252 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, |
| 2253 PrefService::UNSYNCABLE_PREF); | 2253 PrefService::UNSYNCABLE_PREF); |
| 2254 prefs->RegisterBooleanPref(prefs::kImportBookmarks, |
| 2255 true, |
| 2256 PrefService::UNSYNCABLE_PREF); |
| 2257 prefs->RegisterBooleanPref(prefs::kImportHistory, |
| 2258 true, |
| 2259 PrefService::UNSYNCABLE_PREF); |
| 2260 prefs->RegisterBooleanPref(prefs::kImportHomepage, |
| 2261 true, |
| 2262 PrefService::UNSYNCABLE_PREF); |
| 2263 prefs->RegisterBooleanPref(prefs::kImportSearchEngine, |
| 2264 true, |
| 2265 PrefService::UNSYNCABLE_PREF); |
| 2266 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords, |
| 2267 true, |
| 2268 PrefService::UNSYNCABLE_PREF); |
| 2269 |
| 2254 // We need to register the type of these preferences in order to query | 2270 // We need to register the type of these preferences in order to query |
| 2255 // them even though they're only typically controlled via policy. | 2271 // them even though they're only typically controlled via policy. |
| 2256 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, | 2272 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, |
| 2257 false, | 2273 false, |
| 2258 PrefService::UNSYNCABLE_PREF); | 2274 PrefService::UNSYNCABLE_PREF); |
| 2259 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, | 2275 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, |
| 2260 false, | 2276 false, |
| 2261 PrefService::UNSYNCABLE_PREF); | 2277 PrefService::UNSYNCABLE_PREF); |
| 2262 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, | 2278 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, |
| 2263 false, | 2279 false, |
| (...skipping 2529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4793 window_->BookmarkBarStateChanged(animate_type); | 4809 window_->BookmarkBarStateChanged(animate_type); |
| 4794 } | 4810 } |
| 4795 | 4811 |
| 4796 void Browser::ShowSyncSetup() { | 4812 void Browser::ShowSyncSetup() { |
| 4797 ProfileSyncService* service = profile()->GetProfileSyncService(); | 4813 ProfileSyncService* service = profile()->GetProfileSyncService(); |
| 4798 if (service->HasSyncSetupCompleted()) | 4814 if (service->HasSyncSetupCompleted()) |
| 4799 ShowOptionsTab(chrome::kSyncSetupSubPage); | 4815 ShowOptionsTab(chrome::kSyncSetupSubPage); |
| 4800 else | 4816 else |
| 4801 profile()->GetProfileSyncService()->ShowLoginDialog(); | 4817 profile()->GetProfileSyncService()->ShowLoginDialog(); |
| 4802 } | 4818 } |
| OLD | NEW |