| Index: chrome/browser/prefs/session_startup_pref.cc
|
| diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc
|
| index 5738b6e8d4a2f79775561efa51dbb99c971e8f64..cb421b62be5b89acda43a89c85a8bd20bdeedd5c 100644
|
| --- a/chrome/browser/prefs/session_startup_pref.cc
|
| +++ b/chrome/browser/prefs/session_startup_pref.cc
|
| @@ -12,18 +12,12 @@
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/scoped_user_pref_update.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/protector/protected_prefs_watcher.h"
|
| -#include "chrome/browser/protector/protector_service.h"
|
| -#include "chrome/browser/protector/protector_service_factory.h"
|
| #include "chrome/common/pref_names.h"
|
|
|
| #if defined(OS_MACOSX)
|
| #include "chrome/browser/ui/cocoa/window_restore_utils.h"
|
| #endif
|
|
|
| -using protector::ProtectedPrefsWatcher;
|
| -using protector::ProtectorServiceFactory;
|
| -
|
| namespace {
|
|
|
| // Converts a SessionStartupPref::Type to an integer written to prefs.
|
| @@ -235,33 +229,6 @@ SessionStartupPref::Type SessionStartupPref::PrefValueToType(int pref_value) {
|
| }
|
| }
|
|
|
| -// static
|
| -bool SessionStartupPref::DidStartupPrefChange(Profile* profile) {
|
| - ProtectedPrefsWatcher* prefs_watcher =
|
| - ProtectorServiceFactory::GetForProfile(profile)->GetPrefsWatcher();
|
| - return prefs_watcher->DidPrefChange(prefs::kRestoreOnStartup) ||
|
| - prefs_watcher->DidPrefChange(prefs::kURLsToRestoreOnStartup);
|
| -}
|
| -
|
| -// static
|
| -SessionStartupPref SessionStartupPref::GetStartupPrefBackup(Profile* profile) {
|
| - protector::ProtectedPrefsWatcher* prefs_watcher =
|
| - protector::ProtectorServiceFactory::GetForProfile(profile)->
|
| - GetPrefsWatcher();
|
| -
|
| - int type;
|
| - CHECK(prefs_watcher->GetBackupForPref(
|
| - prefs::kRestoreOnStartup)->GetAsInteger(&type));
|
| - SessionStartupPref backup_pref(PrefValueToType(type));
|
| -
|
| - const ListValue* url_list;
|
| - CHECK(prefs_watcher->GetBackupForPref(
|
| - prefs::kURLsToRestoreOnStartup)->GetAsList(&url_list));
|
| - URLListToPref(url_list, &backup_pref);
|
| -
|
| - return backup_pref;
|
| -}
|
| -
|
| SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
|
|
|
| SessionStartupPref::~SessionStartupPref() {}
|
|
|