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 2312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2323 PrefService::UNSYNCABLE_PREF); | 2323 PrefService::UNSYNCABLE_PREF); |
2324 prefs->RegisterBooleanPref(prefs::kImportHomepage, | 2324 prefs->RegisterBooleanPref(prefs::kImportHomepage, |
2325 true, | 2325 true, |
2326 PrefService::UNSYNCABLE_PREF); | 2326 PrefService::UNSYNCABLE_PREF); |
2327 prefs->RegisterBooleanPref(prefs::kImportSearchEngine, | 2327 prefs->RegisterBooleanPref(prefs::kImportSearchEngine, |
2328 true, | 2328 true, |
2329 PrefService::UNSYNCABLE_PREF); | 2329 PrefService::UNSYNCABLE_PREF); |
2330 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords, | 2330 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords, |
2331 true, | 2331 true, |
2332 PrefService::UNSYNCABLE_PREF); | 2332 PrefService::UNSYNCABLE_PREF); |
| 2333 // The map of timestamps of the last used file browser handlers. |
| 2334 prefs->RegisterDictionaryPref(prefs::kLastUsedFileBrowserHandlers, |
| 2335 PrefService::UNSYNCABLE_PREF); |
2333 | 2336 |
2334 // We need to register the type of these preferences in order to query | 2337 // We need to register the type of these preferences in order to query |
2335 // them even though they're only typically controlled via policy. | 2338 // them even though they're only typically controlled via policy. |
2336 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, | 2339 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, |
2337 false, | 2340 false, |
2338 PrefService::UNSYNCABLE_PREF); | 2341 PrefService::UNSYNCABLE_PREF); |
2339 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, | 2342 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, |
2340 false, | 2343 false, |
2341 PrefService::UNSYNCABLE_PREF); | 2344 PrefService::UNSYNCABLE_PREF); |
2342 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, | 2345 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, |
(...skipping 2928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5271 } else if (is_type_tabbed()) { | 5274 } else if (is_type_tabbed()) { |
5272 GlobalErrorService* service = | 5275 GlobalErrorService* service = |
5273 GlobalErrorServiceFactory::GetForProfile(profile()); | 5276 GlobalErrorServiceFactory::GetForProfile(profile()); |
5274 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5277 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
5275 if (error) { | 5278 if (error) { |
5276 error->ShowBubbleView(this); | 5279 error->ShowBubbleView(this); |
5277 did_show_bubble = true; | 5280 did_show_bubble = true; |
5278 } | 5281 } |
5279 } | 5282 } |
5280 } | 5283 } |
OLD | NEW |