| OLD | NEW |
| 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 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1356 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L""); | 1356 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L""); |
| 1357 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); | 1357 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); |
| 1358 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); | 1358 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); |
| 1359 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); | 1359 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); |
| 1360 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); | 1360 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); |
| 1361 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); | 1361 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); |
| 1362 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); | 1362 prefs->RegisterBooleanPref(prefs::kDeleteFormData, true); |
| 1363 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); | 1363 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); |
| 1364 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); | 1364 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); |
| 1365 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 1365 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
| 1366 prefs->RegisterIntegerPref(prefs::kNTPPromoRemaining, 5); | 1366 prefs->RegisterIntegerPref(prefs::kNTPPromoLineRemaining, 5); |
| 1367 prefs->RegisterIntegerPref(prefs::kNTPPromoImageRemaining, 5); |
| 1367 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true); | 1368 prefs->RegisterBooleanPref(prefs::kShowExtensionShelf, true); |
| 1368 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 1369 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
| 1369 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 1370 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
| 1370 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 1371 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
| 1371 } | 1372 } |
| 1372 | 1373 |
| 1373 // static | 1374 // static |
| 1374 Browser* Browser::GetBrowserForController( | 1375 Browser* Browser::GetBrowserForController( |
| 1375 const NavigationController* controller, int* index_result) { | 1376 const NavigationController* controller, int* index_result) { |
| 1376 BrowserList::const_iterator it; | 1377 BrowserList::const_iterator it; |
| (...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3059 /////////////////////////////////////////////////////////////////////////////// | 3060 /////////////////////////////////////////////////////////////////////////////// |
| 3060 // BrowserToolbarModel (private): | 3061 // BrowserToolbarModel (private): |
| 3061 | 3062 |
| 3062 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { | 3063 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { |
| 3063 // This |current_tab| can be NULL during the initialization of the | 3064 // This |current_tab| can be NULL during the initialization of the |
| 3064 // toolbar during window creation (i.e. before any tabs have been added | 3065 // toolbar during window creation (i.e. before any tabs have been added |
| 3065 // to the window). | 3066 // to the window). |
| 3066 TabContents* current_tab = browser_->GetSelectedTabContents(); | 3067 TabContents* current_tab = browser_->GetSelectedTabContents(); |
| 3067 return current_tab ? ¤t_tab->controller() : NULL; | 3068 return current_tab ? ¤t_tab->controller() : NULL; |
| 3068 } | 3069 } |
| OLD | NEW |