Add a blocking version of the sync promo dialog

chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc

 // Copyright (c) 2012 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/sync_promo/sync_promo_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 190 matching lines @@
   // confirming that they're signed in.
   std::string username = prefs_->GetString(prefs::kGoogleServicesUsername);
   if (!username.empty())
     prefs_->SetBoolean(prefs::kSyncPromoShowNTPBubble, true);
 
   // If the browser window is being closed then don't try to navigate to
   // another URL. This prevents the browser window from flashing during
   // close.
   Browser* browser =
       BrowserList::FindBrowserWithWebContents(web_ui()->GetWebContents());
-  if (browser && !browser->IsAttemptingToCloseBrowser()) {
+  if (!browser || !browser->IsAttemptingToCloseBrowser()) {
     GURL url = SyncPromoUI::GetNextPageURLForSyncPromoURL(
         web_ui()->GetWebContents()->GetURL());
     OpenURLParams params(
         url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK, false);
     web_ui()->GetWebContents()->OpenURL(params);
   }
 }
 
+int SyncPromoHandler::GetPromoVersion() {
+  switch (SyncPromoUI::GetSyncPromoVersion()) {
+    case SyncPromoUI::VERSION_DEFAULT:
+      return 0;
+    case SyncPromoUI::VERSION_DEVICES:
+      return 1;
+    case SyncPromoUI::VERSION_VERBOSE:
+      return 2;
+    case SyncPromoUI::VERSION_SIMPLE:
+      return 3;
+    case SyncPromoUI::VERSION_DIALOG:
+      // Use the simple sync promo layout for the dialog version.
+      return 3;
+    default:
+      NOTREACHED();
+      return 0;
+  }
+}
+
 void SyncPromoHandler::HandleInitializeSyncPromo(const base::ListValue* args) {
-  base::FundamentalValue version(SyncPromoUI::GetSyncPromoVersion());
+  base::FundamentalValue version(GetPromoVersion());
   web_ui()->CallJavascriptFunction("SyncSetupOverlay.showPromoVersion",
                                    version);
 
   OpenSyncSetup();
   // We don't need to compute anything for this, just do this every time.
   RecordUserFlowAction(SYNC_PROMO_VIEWED);
   // Increment view count first and show natural numbers in stats rather than 0
   // based starting point (if it happened to be our first time showing this).
   IncrementViewCountBy(1);
   // Record +1 for every view.  This is the only thing we record that's not part
@@ skipping 64 matching lines @@
   // The following call does not use the standard UMA macro because the
   // histogram name is only known at runtime.  The standard macros declare
   // static variables that won't work if the name changes on differnt calls.
   if (!histogram_name_.empty()) {
     base::Histogram* histogram = base::LinearHistogram::FactoryGet(
         histogram_name_, 1, SYNC_PROMO_BUCKET_BOUNDARY,
         SYNC_PROMO_BUCKET_BOUNDARY + 1, base::Histogram::kNoFlags);
     histogram->Add(action);
   }
 }