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

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

Issue 437053: In-application Keystone ticket promotion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years 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/browser/app_controller_mac.mm ('k') | chrome/browser/browser_init.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/gfx/point.h" 10 #include "base/gfx/point.h"
(...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 #if defined(OS_MACOSX) 1343 #if defined(OS_MACOSX)
1344 // This really belongs in platform code, but there's no good place to 1344 // This really belongs in platform code, but there's no good place to
1345 // initialize it between the time when the AppController is created 1345 // initialize it between the time when the AppController is created
1346 // (where there's no profile) and the time the controller gets another 1346 // (where there's no profile) and the time the controller gets another
1347 // crack at the start of the main event loop. By that time, BrowserInit 1347 // crack at the start of the main event loop. By that time, BrowserInit
1348 // has already created the browser window, and it's too late: we need the 1348 // has already created the browser window, and it's too late: we need the
1349 // pref to be already initialized. Doing it here also saves us from having 1349 // pref to be already initialized. Doing it here also saves us from having
1350 // to hard-code pref registration in the several unit tests that use 1350 // to hard-code pref registration in the several unit tests that use
1351 // this preference. 1351 // this preference.
1352 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); 1352 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false);
1353 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
1353 #endif 1354 #endif
1354 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L""); 1355 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L"");
1355 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); 1356 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
1356 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); 1357 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
1357 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); 1358 prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
1358 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); 1359 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
1359 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); 1360 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
1360 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); 1361 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
1361 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); 1362 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
1362 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); 1363 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
3051 /////////////////////////////////////////////////////////////////////////////// 3052 ///////////////////////////////////////////////////////////////////////////////
3052 // BrowserToolbarModel (private): 3053 // BrowserToolbarModel (private):
3053 3054
3054 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 3055 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
3055 // This |current_tab| can be NULL during the initialization of the 3056 // This |current_tab| can be NULL during the initialization of the
3056 // toolbar during window creation (i.e. before any tabs have been added 3057 // toolbar during window creation (i.e. before any tabs have been added
3057 // to the window). 3058 // to the window).
3058 TabContents* current_tab = browser_->GetSelectedTabContents(); 3059 TabContents* current_tab = browser_->GetSelectedTabContents();
3059 return current_tab ? &current_tab->controller() : NULL; 3060 return current_tab ? &current_tab->controller() : NULL;
3060 } 3061 }
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698