Fix syncing of sessions. Numerous changes have been made. Currently, the mode...

chrome/browser/sync/sync_setup_wizard.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/sync/sync_setup_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 97 matching lines @@
     AddString(dict, "invalidcredentials", IDS_SYNC_INVALID_USER_CREDENTIALS);
     AddString(dict, "signin", IDS_SYNC_SIGNIN);
     AddString(dict, "couldnotconnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT);
     AddString(dict, "cannotaccessaccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT);
     AddString(dict, "createaccount", IDS_SYNC_CREATE_ACCOUNT);
     AddString(dict, "cancel", IDS_CANCEL);
     AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP);
     AddString(dict, "success", IDS_SYNC_SUCCESS);
     AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN);
     AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS);
-
     AddString(dict, "invalidaccesscode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL);
     AddString(dict, "enteraccesscode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL);
     AddString(dict, "getaccesscodehelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL);
     AddString(dict, "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL);
   } else if (path_raw == kSyncConfigurePath) {
     html_resource_id = IDR_SYNC_CONFIGURE_HTML;
 
     AddString(dict, "dataTypes", IDS_SYNC_DATA_TYPES_TAB_NAME);
     AddString(dict, "encryption", IDS_SYNC_ENCRYPTION_TAB_NAME);
 
     // Stuff for the choose data types localized.
     AddString(dict, "choosedatatypesheader", IDS_SYNC_CHOOSE_DATATYPES_HEADER);
     dict->SetString("choosedatatypesinstructions",
         GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS,
                         GetStringUTF16(IDS_PRODUCT_NAME)));
     AddString(dict, "keepeverythingsynced", IDS_SYNC_EVERYTHING);
     AddString(dict, "choosedatatypes", IDS_SYNC_CHOOSE_DATATYPES);
     AddString(dict, "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS);
     AddString(dict, "preferences", IDS_SYNC_DATATYPE_PREFERENCES);
     AddString(dict, "autofill", IDS_SYNC_DATATYPE_AUTOFILL);
     AddString(dict, "themes", IDS_SYNC_DATATYPE_THEMES);
     AddString(dict, "passwords", IDS_SYNC_DATATYPE_PASSWORDS);
     AddString(dict, "extensions", IDS_SYNC_DATATYPE_EXTENSIONS);
     AddString(dict, "typedurls", IDS_SYNC_DATATYPE_TYPED_URLS);
     AddString(dict, "apps", IDS_SYNC_DATATYPE_APPS);
+    AddString(dict, "foreignsessions", IDS_SYNC_DATATYPE_SESSIONS);
     AddString(dict, "synczerodatatypeserror", IDS_SYNC_ZERO_DATA_TYPES_ERROR);
     AddString(dict, "abortederror", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR);
 
     // Stuff for the encryption tab.
     dict->SetString("encryptionInstructions",
         GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS,
                         GetStringUTF16(IDS_PRODUCT_NAME)));
     AddString(dict, "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL);
     AddString(dict, "usePassphraseLabel", IDS_SYNC_PASSPHRASE_CHECKBOX_LABEL);
     AddString(dict, "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING);
@@ skipping 127 matching lines @@
     result = GAIA_SUCCESS;
   } else if (start_state == ENTER_PASSPHRASE) {
     result = DONE;
   } else if (start_state == CONFIGURE) {
     result = DONE;
   }
   DCHECK_NE(FATAL_ERROR, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }