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

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

Issue 394005: Add message and image to NTP to promote extensions and bookmark sync.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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
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/gfx/point.h" 10 #include "base/gfx/point.h"
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L""); 1337 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L"");
1338 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); 1338 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
1339 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); 1339 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
1340 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); 1340 prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
1341 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); 1341 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
1342 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); 1342 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
1343 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); 1343 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
1344 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); 1344 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
1345 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); 1345 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
1346 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); 1346 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true);
1347 prefs->RegisterIntegerPref(prefs::kNTPThemePromoRemaining, 5); 1347 prefs->RegisterIntegerPref(prefs::kNTPPromoRemaining, 5);
1348 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true); 1348 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true);
1349 } 1349 }
1350 1350
1351 // static 1351 // static
1352 Browser* Browser::GetBrowserForController( 1352 Browser* Browser::GetBrowserForController(
1353 const NavigationController* controller, int* index_result) { 1353 const NavigationController* controller, int* index_result) {
1354 BrowserList::const_iterator it; 1354 BrowserList::const_iterator it;
1355 for (it = BrowserList::begin(); it != BrowserList::end(); ++it) { 1355 for (it = BrowserList::begin(); it != BrowserList::end(); ++it) {
1356 int index = (*it)->tabstrip_model_.GetIndexOfController(controller); 1356 int index = (*it)->tabstrip_model_.GetIndexOfController(controller);
1357 if (index != TabStripModel::kNoTab) { 1357 if (index != TabStripModel::kNoTab) {
(...skipping 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after
3024 /////////////////////////////////////////////////////////////////////////////// 3024 ///////////////////////////////////////////////////////////////////////////////
3025 // BrowserToolbarModel (private): 3025 // BrowserToolbarModel (private):
3026 3026
3027 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 3027 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
3028 // This |current_tab| can be NULL during the initialization of the 3028 // This |current_tab| can be NULL during the initialization of the
3029 // toolbar during window creation (i.e. before any tabs have been added 3029 // toolbar during window creation (i.e. before any tabs have been added
3030 // to the window). 3030 // to the window).
3031 TabContents* current_tab = browser_->GetSelectedTabContents(); 3031 TabContents* current_tab = browser_->GetSelectedTabContents();
3032 return current_tab ? &current_tab->controller() : NULL; 3032 return current_tab ? &current_tab->controller() : NULL;
3033 } 3033 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698