Added classes to enable session sync functionality.

TEST=ProfileSyncServiceSessionTest
BUG=30519

Original patch by jerrica@chromium.org
Original review: http://codereview.chromium.org/3168009

Review URL: http://codereview.chromium.org/3184004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56423 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 20 insertions, 0 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index b99a8cb..630c4b7 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -243,6 +243,9 @@ const char kDisableSyncPasswords[]          = "disable-sync-passwords";
 // Disable syncing of preferences.
 const char kDisableSyncPreferences[]        = "disable-sync-preferences";
 
+// Disable syncing of sessions.
+const char kDisableSyncSessions[]        = "disable-sync-sessions";
+
 // Disable syncing of themes.
 const char kDisableSyncThemes[]             = "disable-sync-themes";
 
@@ -436,6 +439,9 @@ const char kEnableSyncPasswords[]           = "enable-sync-passwords";
 // Enable syncing browser preferences.
 const char kEnableSyncPreferences[]         = "enable-sync-preferences";
 
+// Enable syncing browser sessions.
+const char kEnableSyncSessions[]         = "enable-sync-sessions";
+
 // Enable syncing browser themes.
 const char kEnableSyncThemes[]              = "enable-sync-themes";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1c6c116d0..9591d5c 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -87,6 +87,7 @@ extern const char kDisableSyncPasswords[];
 extern const char kDisableSyncPreferences[];
 extern const char kDisableSyncThemes[];
 extern const char kDisableSyncTypedUrls[];
+extern const char kDisableSyncSessions[];
 extern const char kDisableTabCloseableStateWatcher[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebSecurity[];
@@ -140,6 +141,7 @@ extern const char kEnableSyncBookmarks[];
 extern const char kEnableSyncExtensions[];
 extern const char kEnableSyncPasswords[];
 extern const char kEnableSyncPreferences[];
+extern const char kEnableSyncSessions[];
 extern const char kEnableSyncThemes[];
 extern const char kEnableSyncTypedUrls[];
 extern const char kEnableTabbedOptions[];
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 0a0c58f..48871b4 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -1017,6 +1017,16 @@ class NotificationType {
     // operations.
     SESSION_SERVICE_SAVED,
 
+    // A foreign session has been updated.  If a new tab page is open, the
+    // foreign session handler needs to update the new tab page's foreign
+    // session data.
+    FOREIGN_SESSION_UPDATED,
+
+    // A foreign session has been deleted.  If a new tab page is open, the
+    // foreign session handler needs to update the new tab page's foreign
+    // session data.
+    FOREIGN_SESSION_DELETED,
+
     // The syncer requires a passphrase to decrypt sensitive updates. This
     // notification is sent when the first sensitive data type is setup by the
     // user as well as anytime any the passphrase is changed in another synced
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 01f3a6a2..40183d1 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -883,6 +883,7 @@ const char kSyncAutofill[] = "sync.autofill";
 const char kSyncThemes[] = "sync.themes";
 const char kSyncTypedUrls[] = "sync.typed_urls";
 const char kSyncExtensions[] = "sync.extensions";
+const char kSyncSessions[] = "sync.sessions";
 
 // Boolean used by enterprise configuration management in order to lock down
 // sync.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 21d44db..f27005a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -318,6 +318,7 @@ extern const char kNTPPrefVersion[];
 
 extern const char kDevToolsOpenDocked[];
 extern const char kDevToolsSplitLocation[];
+extern const char kSyncSessions[];
 
 extern const char kSyncLastSyncedTime[];
 extern const char kSyncHasSetupCompleted[];