Sync Promo: Add a way to collapse the sync promo

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2011 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/ui/webui/options/sync_setup_handler.h"
+#include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 134 matching lines @@
 SyncSetupHandler::SyncSetupHandler() : flow_(NULL) {
 }
 
 SyncSetupHandler::~SyncSetupHandler() {
   // This case is hit when the user performs a back navigation.
   if (flow_)
     flow_->OnDialogClosed("");
 }
 
 void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
+  GetStaticLocalizedValues(localized_strings);
+}
+
+void SyncSetupHandler::GetStaticLocalizedValues(
+    DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString(
       "invalidPasswordHelpURL",
       google_util::StringAppendGoogleLocaleParam(kInvalidPasswordHelpUrl));
   localized_strings->SetString(
       "cannotAccessAccountURL",
       google_util::StringAppendGoogleLocaleParam(kCanNotAccessAccountUrl));
   localized_strings->SetString(
       "createNewAccountURL",
@@ skipping 82 matching lines @@
     { "cancelWarningHeader", IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER },
     { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING },
     { "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES },
     { "no", IDS_SYNC_PASSPHRASE_CANCEL_NO },
     { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX },
     { "sectionExplicitMessagePostfix",
         IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX },
     { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE },
     { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA },
     { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
+    { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
+    { "statusNotConnected", IDS_SYNC_STATUS_NOT_CONNECTED }
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 }
 
 void SyncSetupHandler::Initialize() {
 }
 
 void SyncSetupHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("SyncSetupDidClosePage",
@@ skipping 54 matching lines @@
 
 void SyncSetupHandler::SetFlow(SyncSetupFlow* flow) {
   flow_ = flow;
 }
 
 void SyncSetupHandler::Focus() {
   static_cast<RenderViewHostDelegate*>(web_ui_->tab_contents())->Activate();
 }
 
 void SyncSetupHandler::OnDidClosePage(const ListValue* args) {
-  if (flow_) {
-    flow_->OnDialogClosed(std::string());
-    flow_ = NULL;
-  }
+  CloseSyncSetup();
 }
 
 void SyncSetupHandler::HandleSubmitAuth(const ListValue* args) {
   std::string json;
   if (!args->GetString(0, &json)) {
     NOTREACHED() << "Could not read JSON argument";
     return;
   }
 
   if (json.empty())
@@ skipping 54 matching lines @@
   DCHECK(flow_);
   flow_->OnPassphraseEntry(passphrase);
 }
 
 void SyncSetupHandler::HandlePassphraseCancel(const ListValue* args) {
   DCHECK(flow_);
   flow_->OnPassphraseCancel();
 }
 
 void SyncSetupHandler::HandleAttachHandler(const ListValue* args) {
-  DCHECK(web_ui_);
-  DCHECK(!flow_);
-
-  ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService();
-  if (!service) {
-    // If there's no sync service, the user tried to manually invoke a syncSetup
-    // URL, but sync features are disabled.  We need to close the overlay for
-    // this (rare) case.
-    web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
-    return;
-  }
-
-  // If the wizard is not visible, step into the appropriate UI state.
-  if (!service->get_wizard().IsVisible())
-    HandleShowSetupUI(NULL);
-
-  // The SyncSetupFlow will set itself as the |flow_|.
-  if (!service->get_wizard().AttachSyncSetupHandler(this)) {
-    // If attach fails, a wizard is already activated and attached to a flow
-    // handler.
-    web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
-    service->get_wizard().Focus();
-  }
+  OpenSyncSetup();
 }
 
 void SyncSetupHandler::HandleShowErrorUI(const ListValue* args) {
   DCHECK(!flow_);
 
   ProfileSyncService* service =
     web_ui_->GetProfile()->GetProfileSyncService();
   DCHECK(service);
 
   service->get_wizard().Step(SyncSetupWizard::NONFATAL_ERROR);
 
   // The SyncSetupFlow will set itself as the |flow_|.
   if (!service->get_wizard().AttachSyncSetupHandler(this)) {
     web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
     service->get_wizard().Focus();
   }
 }
 
 void SyncSetupHandler::HandleShowSetupUI(const ListValue* args) {
   DCHECK(!flow_);
+  ShowSetupUI();
+}
 
-  ProfileSyncService* service =
-      web_ui_->GetProfile()->GetProfileSyncService();
-  DCHECK(service);
+void SyncSetupHandler::CloseSyncSetup() {
+  if (flow_) {
+    flow_->OnDialogClosed(std::string());
+    flow_ = NULL;
+  }
+}
 
-  // If the wizard is already visible, focus it.
-  if (service->get_wizard().IsVisible()) {
+void SyncSetupHandler::OpenSyncSetup() {
+  DCHECK(web_ui_);
+  DCHECK(!flow_);
+
+  ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService();
+  if (!service) {
+    // If there's no sync service, the user tried to manually invoke a syncSetup
+    // URL, but sync features are disabled.  We need to close the overlay for
+    // this (rare) case.
     web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
-    service->get_wizard().Focus();
     return;
   }
 
-  // The user is trying to manually load a syncSetup URL.  We should bring up
-  // either a login or a configure flow based on the state of sync.
-  if (service->HasSyncSetupCompleted())
-    service->get_wizard().Step(SyncSetupWizard::CONFIGURE);
-  else
-    service->get_wizard().Step(SyncSetupWizard::GAIA_LOGIN);
+  // If the wizard is not visible, step into the appropriate UI state.
+  if (!service->get_wizard().IsVisible())
+    ShowSetupUI();
 
-  // Show the Sync Setup page.
-  scoped_ptr<Value> page(Value::CreateStringValue("syncSetup"));
-  web_ui_->CallJavascriptFunction("OptionsPage.navigateToPage", *page);
+  // The SyncSetupFlow will set itself as the |flow_|.
+  if (!service->get_wizard().AttachSyncSetupHandler(this)) {
+    // If attach fails, a wizard is already activated and attached to a flow
+    // handler.
+    web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
+    service->get_wizard().Focus();
+  }
 }