Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1063)

Side by Side Diff: chrome/browser/browser.cc

Issue 524026: Adds "Delete Local Storage" option to "Clear Browsing Data" for Windows and G... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | chrome/browser/browsing_data_remover.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser.h" 5 #include "chrome/browser/browser.h"
6 6
7 #include "app/animation.h" 7 #include "app/animation.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 // pref to be already initialized. Doing it here also saves us from having 1387 // pref to be already initialized. Doing it here also saves us from having
1388 // to hard-code pref registration in the several unit tests that use 1388 // to hard-code pref registration in the several unit tests that use
1389 // this preference. 1389 // this preference.
1390 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); 1390 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false);
1391 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true); 1391 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
1392 #endif 1392 #endif
1393 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L""); 1393 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L"");
1394 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); 1394 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
1395 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); 1395 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
1396 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); 1396 prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
1397 prefs->RegisterBooleanPref(prefs::kDeleteLocalStorage, true);
1397 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); 1398 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
1398 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); 1399 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
1399 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); 1400 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
1400 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); 1401 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
1401 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); 1402 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
1402 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); 1403 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true);
1403 prefs->RegisterIntegerPref(prefs::kNTPPromoLineRemaining, 5); 1404 prefs->RegisterIntegerPref(prefs::kNTPPromoLineRemaining, 5);
1404 prefs->RegisterIntegerPref(prefs::kNTPPromoImageRemaining, 5); 1405 prefs->RegisterIntegerPref(prefs::kNTPPromoImageRemaining, 5);
1405 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true); 1406 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true);
1406 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); 1407 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
(...skipping 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
3196 /////////////////////////////////////////////////////////////////////////////// 3197 ///////////////////////////////////////////////////////////////////////////////
3197 // BrowserToolbarModel (private): 3198 // BrowserToolbarModel (private):
3198 3199
3199 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 3200 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
3200 // This |current_tab| can be NULL during the initialization of the 3201 // This |current_tab| can be NULL during the initialization of the
3201 // toolbar during window creation (i.e. before any tabs have been added 3202 // toolbar during window creation (i.e. before any tabs have been added
3202 // to the window). 3203 // to the window).
3203 TabContents* current_tab = browser_->GetSelectedTabContents(); 3204 TabContents* current_tab = browser_->GetSelectedTabContents();
3204 return current_tab ? &current_tab->controller() : NULL; 3205 return current_tab ? &current_tab->controller() : NULL;
3205 } 3206 }
OLDNEW
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | chrome/browser/browsing_data_remover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698