Facelifts to sync UI

chrome/browser/views/sync/sync_setup_wizard.cc

 // Copyright (c) 2006-2008 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.
 
 #ifdef CHROME_PERSONALIZATION
 
 #include "chrome/browser/views/sync/sync_setup_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
@@ skipping 62 matching lines @@
         l10n_util::GetString(IDS_SYNC_LOGIN_COULD_NOT_CONNECT));
     localized_strings.SetString(L"cannotaccessaccount",
         l10n_util::GetString(IDS_SYNC_CANNOT_ACCESS_ACCOUNT));
     localized_strings.SetString(L"createaccount",
         l10n_util::GetString(IDS_SYNC_CREATE_ACCOUNT));
     localized_strings.SetString(L"cancel",
         l10n_util::GetString(IDS_CANCEL));
     localized_strings.SetString(L"settingup",
         l10n_util::GetString(IDS_SYNC_LOGIN_SETTING_UP));
     localized_strings.SetString(L"success",
-        l10n_util::GetString(IDS_SYNC_LOGIN_SUCCESS));
+        l10n_util::GetString(IDS_SYNC_SUCCESS));
     localized_strings.SetString(L"errorsigningin",
         l10n_util::GetString(IDS_SYNC_ERROR_SIGNING_IN));
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_GAIA_LOGIN_HTML));
     SetFontAndTextDirection(&localized_strings);
     response = jstemplate_builder::GetI18nTemplateHtml(
         html, &localized_strings);
   } else if (path_raw == chrome::kSyncMergeAndSyncPath) {
     DictionaryValue localized_strings;
     localized_strings.SetString(L"introduction",
         l10n_util::GetString(IDS_SYNC_MERGE_INTRODUCTION));
     localized_strings.SetString(L"mergeandsynclabel",
         l10n_util::GetString(IDS_SYNC_MERGE_AND_SYNC_LABEL));
     localized_strings.SetString(L"abortlabel",
         l10n_util::GetString(IDS_ABORT));
     localized_strings.SetString(L"closelabel",
         l10n_util::GetString(IDS_CLOSE));
-    localized_strings.SetString(L"alldone",
-        l10n_util::GetString(IDS_SYNC_MERGE_ALL_DONE));
     localized_strings.SetString(L"mergeandsyncwarning",
         l10n_util::GetString(IDS_SYNC_MERGE_WARNING));
     localized_strings.SetString(L"setuperror",
                                 l10n_util::GetString(IDS_SYNC_SETUP_ERROR));
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_MERGE_AND_SYNC_HTML));
     SetFontAndTextDirection(&localized_strings);
     response = jstemplate_builder::GetI18nTemplateHtml(
         html, &localized_strings);
+  } else if (path_raw == chrome::kSyncSetupDonePath) {
+    DictionaryValue localized_strings;
+    localized_strings.SetString(L"success",
+        l10n_util::GetString(IDS_SYNC_SUCCESS));
+    localized_strings.SetString(L"setupsummary",
+        l10n_util::GetString(IDS_SYNC_SETUP_ALL_DONE));
+    localized_strings.SetString(L"firsttimesetupsummary",
+        l10n_util::GetString(IDS_SYNC_SETUP_FIRST_TIME_ALL_DONE));
+    localized_strings.SetString(L"okay",
+        l10n_util::GetString(IDS_SYNC_SETUP_OK_BUTTON_LABEL));
+    static const base::StringPiece html(ResourceBundle::GetSharedInstance()
+        .GetRawDataResource(IDR_SYNC_SETUP_DONE_HTML));
+    SetFontAndTextDirection(&localized_strings);
+    response = jstemplate_builder::GetI18nTemplateHtml(
+        html, &localized_strings);
   } else if (path_raw == chrome::kSyncSetupFlowPath) {
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_SYNC_SETUP_FLOW_HTML));
     response = html.as_string();
   }
   // Send the response.
   html_bytes->data.resize(response.size());
   std::copy(response.begin(), response.end(), html_bytes->data.begin());
   SendResponse(request_id, html_bytes);
 }
@@ skipping 16 matching lines @@
   delete flow_container_;
 }
 
 void SyncSetupWizard::Step(State advance_state) {
   SyncSetupFlow* flow = flow_container_->get_flow();
   if (flow) {
     // A setup flow is in progress and dialog is currently showing.
     flow->Advance(advance_state);
   } else if (!service_->profile()->GetPrefs()->GetBoolean(
              prefs::kSyncHasSetupCompleted)) {
-    if (advance_state == DONE || advance_state == GAIA_SUCCESS)
+    if (IsTerminalState(advance_state))
       return;
     // No flow is in progress, and we have never escorted the user all the
     // way through the wizard flow.
     flow_container_->set_flow(
         SyncSetupFlow::Run(service_, flow_container_, advance_state, DONE));
   } else {
     // No flow in in progress, but we've finished the wizard flow once before.
     // This is just a discrete run.
-    if (advance_state == DONE || advance_state == GAIA_SUCCESS)
+    if (IsTerminalState(advance_state))
       return;  // Nothing to do.
     flow_container_->set_flow(SyncSetupFlow::Run(service_, flow_container_,
         advance_state, GetEndStateForDiscreteRun(advance_state)));
   }
 }
 
+// static
+bool SyncSetupWizard::IsTerminalState(State advance_state) {
+  return advance_state == GAIA_SUCCESS ||
+         advance_state == DONE ||
+         advance_state == DONE_FIRST_TIME ||
+         advance_state == FATAL_ERROR;
+}
+
 bool SyncSetupWizard::IsVisible() const {
   return flow_container_->get_flow() != NULL;
 }
 
 // static
 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(
     State start_state) {
   State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE;
   DCHECK_NE(DONE, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }
 
 #endif  // CHROME_PERSONALIZATION