| 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 2198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2209 if (home_page_is_new_tab_page_pref && | 2209 if (home_page_is_new_tab_page_pref && |
| 2210 !home_page_is_new_tab_page_pref->IsManaged() && | 2210 !home_page_is_new_tab_page_pref->IsManaged() && |
| 2211 !prefs->HasPrefPath(prefs::kHomePageIsNewTabPage)) | 2211 !prefs->HasPrefPath(prefs::kHomePageIsNewTabPage)) |
| 2212 prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false); | 2212 prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false); |
| 2213 } | 2213 } |
| 2214 | 2214 |
| 2215 // static | 2215 // static |
| 2216 void Browser::RegisterPrefs(PrefService* prefs) { | 2216 void Browser::RegisterPrefs(PrefService* prefs) { |
| 2217 prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); | 2217 prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); |
| 2218 prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1); | 2218 prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1); |
| 2219 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | |
| 2220 prefs->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true); | 2219 prefs->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true); |
| 2221 // Educated guess: Chrome has a bundled Flash version supporting | 2220 // Educated guess: Chrome has a bundled Flash version supporting |
| 2222 // clearing LSO data, Chromium hasn't. | 2221 // clearing LSO data, Chromium hasn't. |
| 2223 #if defined(GOOGLE_CHROME_BUILD) | 2222 #if defined(GOOGLE_CHROME_BUILD) |
| 2224 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true); | 2223 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true); |
| 2225 #else | 2224 #else |
| 2226 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, false); | 2225 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, false); |
| 2227 #endif | 2226 #endif |
| 2228 } | 2227 } |
| 2229 | 2228 |
| (...skipping 2886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5116 } | 5115 } |
| 5117 | 5116 |
| 5118 void Browser::ShowSyncSetup() { | 5117 void Browser::ShowSyncSetup() { |
| 5119 ProfileSyncService* service = | 5118 ProfileSyncService* service = |
| 5120 profile()->GetOriginalProfile()->GetProfileSyncService(); | 5119 profile()->GetOriginalProfile()->GetProfileSyncService(); |
| 5121 if (service->HasSyncSetupCompleted()) | 5120 if (service->HasSyncSetupCompleted()) |
| 5122 ShowOptionsTab(chrome::kSyncSetupSubPage); | 5121 ShowOptionsTab(chrome::kSyncSetupSubPage); |
| 5123 else | 5122 else |
| 5124 service->ShowLoginDialog(); | 5123 service->ShowLoginDialog(); |
| 5125 } | 5124 } |
| OLD | NEW |