Change the navigation code of sync promo slightly to navigate

chrome/browser/ui/webui/sync_promo/sync_promo_ui.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_ui.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 25 matching lines @@
 
 using content::WebContents;
 
 namespace {
 
 const char kStringsJsFile[] = "strings.js";
 const char kSyncPromoJsFile[] = "sync_promo.js";
 
 const char kSyncPromoQueryKeyNextPage[] = "next_page";
 const char kSyncPromoQueryKeySource[] = "source";
+const char kSyncPromoQueryKeyAutoClose[] = "auto_close";
 
 // The maximum number of times we want to show the sync promo at startup.
 const int kSyncPromoShowAtStartupMaximum = 10;
 
 // Checks we want to show the sync promo for the given brand.
 bool AllowPromoAtStartupForCurrentBrand() {
   std::string brand;
   google_util::GetBrand(&brand);
 
   if (brand.empty())
@@ skipping 142 matching lines @@
 
 bool SyncPromoUI::HasUserSkippedSyncPromo(Profile* profile) {
   return profile->GetPrefs()->GetBoolean(prefs::kSyncPromoUserSkipped);
 }
 
 void SyncPromoUI::SetUserSkippedSyncPromo(Profile* profile) {
   profile->GetPrefs()->SetBoolean(prefs::kSyncPromoUserSkipped, true);
 }
 
 // static
-GURL SyncPromoUI::GetSyncPromoURL(const GURL& next_page, Source source) {
+GURL SyncPromoUI::GetSyncPromoURL(
+    const GURL& next_page, Source source, bool auto_close) {

[sky, 2012/07/23 18:31:20]

nit: when you wrap, each param on its own line.

[Munjal (Google), 2012/07/23 18:35:18]

Done.

   DCHECK_NE(SOURCE_UNKNOWN, source);
 
   std::stringstream stream;
   stream << chrome::kChromeUISyncPromoURL << "?"
          << kSyncPromoQueryKeySource << "=" << static_cast<int>(source);
 
+  if (auto_close)
+    stream << "&" << kSyncPromoQueryKeyAutoClose << "=1";
+
   if (!next_page.spec().empty()) {
     url_canon::RawCanonOutputT<char> output;
     url_util::EncodeURIComponent(
         next_page.spec().c_str(), next_page.spec().length(), &output);
     std::string escaped_spec(output.data(), output.length());
     stream << "&" << kSyncPromoQueryKeyNextPage << "=" << escaped_spec;
   }
 
   return GURL(stream.str());
 }
@@ skipping 14 matching lines @@
   if (chrome_common_net::GetValueForKeyInQuery(
           url, kSyncPromoQueryKeySource, &value)) {
     int source = 0;
     if (base::StringToInt(value, &source) && source >= SOURCE_START_PAGE &&
         source < SOURCE_UNKNOWN) {
       return static_cast<Source>(source);
     }
   }
   return SOURCE_UNKNOWN;
 }
+
+// static
+bool SyncPromoUI::GetAutoCloseForSyncPromoURL(const GURL& url) {
+  std::string value;
+  if (chrome_common_net::GetValueForKeyInQuery(
+          url, kSyncPromoQueryKeyAutoClose, &value)) {
+    int source = 0;
+    base::StringToInt(value, &source);
+    return (source == 1);
+  }
+  return false;
+}