diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 00:35:40 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 00:35:40 +0000 |
| commit | 06202ec3ce72f1e2f28e7097e3306d8d11cdef13 (patch) | |
| tree | fc7a9ffaea93c8c341313e3df096f489f96917ef /chrome/browser/prefs | |
| parent | d32d20571991e31c2db1965aae2983be23d46a89 (diff) | |
| download | chromium_src-06202ec3ce72f1e2f28e7097e3306d8d11cdef13.zip chromium_src-06202ec3ce72f1e2f28e7097e3306d8d11cdef13.tar.gz chromium_src-06202ec3ce72f1e2f28e7097e3306d8d11cdef13.tar.bz2 | |
Mac: Master Prefs first_run_tabs ignored on Lion
Changes Lion specific session restore logic to account for first run scenario.
BUG=93779
TEST=Manual: Delete prefs from disk, turn on system resume setting, launch Chrome, observe Welcome page.
Review URL: http://codereview.chromium.org/7717010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/session_startup_pref.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 34176a9..2f02aaf 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -16,6 +16,7 @@ #include "chrome/common/pref_names.h" #ifdef OS_MACOSX +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/ui/cocoa/window_restore_utils.h" #endif @@ -107,7 +108,9 @@ SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) { PrefValueToType(prefs->GetInteger(prefs::kRestoreOnStartup))); #ifdef OS_MACOSX - if (TypeIsDefaultValue(prefs)) { + // During first run the calling code relies on |DEFAULT| session preference + // value to avoid session restore. That is respected here. + if (!FirstRun::IsChromeFirstRun() && TypeIsDefaultValue(prefs)) { // |DEFAULT| really means "Don't restore". The actual default value could // change, so explicitly set both. if (restore_utils::IsWindowRestoreEnabled()) |