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

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

Issue 217020: Add theme promo to NTP (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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/theme/theme_resources.grd ('k') | chrome/browser/dom_ui/dom_ui_theme_source.cc » ('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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/idle_timer.h" 10 #include "base/idle_timer.h"
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1316 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L""); 1316 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L"");
1317 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); 1317 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
1318 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); 1318 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
1319 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); 1319 prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
1320 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); 1320 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
1321 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); 1321 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
1322 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); 1322 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
1323 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); 1323 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
1324 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); 1324 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
1325 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); 1325 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true);
1326 prefs->RegisterIntegerPref(prefs::kNTPThemePromoRemaining, 5);
1326 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true); 1327 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true);
1327 } 1328 }
1328 1329
1329 // static 1330 // static
1330 Browser* Browser::GetBrowserForController( 1331 Browser* Browser::GetBrowserForController(
1331 const NavigationController* controller, int* index_result) { 1332 const NavigationController* controller, int* index_result) {
1332 BrowserList::const_iterator it; 1333 BrowserList::const_iterator it;
1333 for (it = BrowserList::begin(); it != BrowserList::end(); ++it) { 1334 for (it = BrowserList::begin(); it != BrowserList::end(); ++it) {
1334 int index = (*it)->tabstrip_model_.GetIndexOfController(controller); 1335 int index = (*it)->tabstrip_model_.GetIndexOfController(controller);
1335 if (index != TabStripModel::kNoTab) { 1336 if (index != TabStripModel::kNoTab) {
(...skipping 1596 matching lines...) Expand 10 before | Expand all | Expand 10 after
2932 /////////////////////////////////////////////////////////////////////////////// 2933 ///////////////////////////////////////////////////////////////////////////////
2933 // BrowserToolbarModel (private): 2934 // BrowserToolbarModel (private):
2934 2935
2935 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 2936 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
2936 // This |current_tab| can be NULL during the initialization of the 2937 // This |current_tab| can be NULL during the initialization of the
2937 // toolbar during window creation (i.e. before any tabs have been added 2938 // toolbar during window creation (i.e. before any tabs have been added
2938 // to the window). 2939 // to the window).
2939 TabContents* current_tab = browser_->GetSelectedTabContents(); 2940 TabContents* current_tab = browser_->GetSelectedTabContents();
2940 return current_tab ? &current_tab->controller() : NULL; 2941 return current_tab ? &current_tab->controller() : NULL;
2941 } 2942 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/dom_ui/dom_ui_theme_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698