diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 10:48:26 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 10:48:26 +0000 |
| commit | 1848cdcc360745bb05cb8ace1f8514f48f6e4e8d (patch) | |
| tree | 52dc78729e210ea3cccf531297a8cc72c068ca3d /chrome/browser/prefs | |
| parent | 95aa0fe92dfe4e0ed05e5c12732c014aa2039dc1 (diff) | |
| download | chromium_src-1848cdcc360745bb05cb8ace1f8514f48f6e4e8d.zip chromium_src-1848cdcc360745bb05cb8ace1f8514f48f6e4e8d.tar.gz chromium_src-1848cdcc360745bb05cb8ace1f8514f48f6e4e8d.tar.bz2 | |
Plugins: allow saving data if we're going to do a session restore.
BUG=104289
TEST=Manual session restore tests.
Review URL: http://codereview.chromium.org/9417003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/session_startup_pref.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/prefs/session_startup_pref.h | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index a441a4c..8ed1cae 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,15 +37,6 @@ int TypeToPrefValue(SessionStartupPref::Type type) { } } -// Converts an integer pref value to a SessionStartupPref::Type. -SessionStartupPref::Type PrefValueToType(int pref_value) { - switch (pref_value) { - case kPrefValueLast: return SessionStartupPref::LAST; - case kPrefValueURLs: return SessionStartupPref::URLS; - default: return SessionStartupPref::DEFAULT; - } -} - } // namespace // static @@ -152,6 +143,15 @@ bool SessionStartupPref::URLsAreManaged(PrefService* prefs) { return pref_urls->IsManaged(); } +// static +SessionStartupPref::Type SessionStartupPref::PrefValueToType(int pref_value) { + switch (pref_value) { + case kPrefValueLast: return SessionStartupPref::LAST; + case kPrefValueURLs: return SessionStartupPref::URLS; + default: return SessionStartupPref::DEFAULT; + } +} + SessionStartupPref::SessionStartupPref() : type(DEFAULT) {} SessionStartupPref::SessionStartupPref(Type type) : type(type) {} diff --git a/chrome/browser/prefs/session_startup_pref.h b/chrome/browser/prefs/session_startup_pref.h index c536da5..226ce01 100644 --- a/chrome/browser/prefs/session_startup_pref.h +++ b/chrome/browser/prefs/session_startup_pref.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -41,6 +41,9 @@ struct SessionStartupPref { static bool TypeIsManaged(PrefService* prefs); static bool URLsAreManaged(PrefService* prefs); + // Converts an integer pref value to a SessionStartupPref::Type. + static SessionStartupPref::Type PrefValueToType(int pref_value); + SessionStartupPref(); explicit SessionStartupPref(Type type); |