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 2439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2450 PrefService::UNSYNCABLE_PREF); | 2450 PrefService::UNSYNCABLE_PREF); |
2451 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, | 2451 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, |
2452 true, | 2452 true, |
2453 PrefService::UNSYNCABLE_PREF); | 2453 PrefService::UNSYNCABLE_PREF); |
2454 prefs->RegisterBooleanPref(prefs::kEnableReferrers, | 2454 prefs->RegisterBooleanPref(prefs::kEnableReferrers, |
2455 true, | 2455 true, |
2456 PrefService::UNSYNCABLE_PREF); | 2456 PrefService::UNSYNCABLE_PREF); |
2457 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, | 2457 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, |
2458 true, | 2458 true, |
2459 PrefService::UNSYNCABLE_PREF); | 2459 PrefService::UNSYNCABLE_PREF); |
| 2460 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo, |
| 2461 false, |
| 2462 PrefService::UNSYNCABLE_PREF); |
2460 | 2463 |
2461 // Initialize the disk cache prefs. | 2464 // Initialize the disk cache prefs. |
2462 prefs->RegisterFilePathPref(prefs::kDiskCacheDir, | 2465 prefs->RegisterFilePathPref(prefs::kDiskCacheDir, |
2463 FilePath(), | 2466 FilePath(), |
2464 PrefService::UNSYNCABLE_PREF); | 2467 PrefService::UNSYNCABLE_PREF); |
2465 prefs->RegisterIntegerPref(prefs::kDiskCacheSize, | 2468 prefs->RegisterIntegerPref(prefs::kDiskCacheSize, |
2466 0, | 2469 0, |
2467 PrefService::UNSYNCABLE_PREF); | 2470 PrefService::UNSYNCABLE_PREF); |
2468 prefs->RegisterIntegerPref(prefs::kMediaCacheSize, | 2471 prefs->RegisterIntegerPref(prefs::kMediaCacheSize, |
2469 0, | 2472 0, |
(...skipping 2864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5334 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5337 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
5335 } else { | 5338 } else { |
5336 GlobalErrorService* service = | 5339 GlobalErrorService* service = |
5337 GlobalErrorServiceFactory::GetForProfile(profile()); | 5340 GlobalErrorServiceFactory::GetForProfile(profile()); |
5338 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5341 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
5339 if (error) { | 5342 if (error) { |
5340 error->ShowBubbleView(this); | 5343 error->ShowBubbleView(this); |
5341 } | 5344 } |
5342 } | 5345 } |
5343 } | 5346 } |
OLD | NEW |