Open continue url from gaia incognito header

chrome/browser/signin/signin_header_helper.cc

 // Copyright 2013 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/signin/signin_header_helper.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ skipping 59 matching lines @@
     const std::string& header_value) {
   std::vector<std::string> fields;
   if (!Tokenize(header_value, std::string(","), &fields))
     return MirrorResponseHeaderDictionary();
 
   MirrorResponseHeaderDictionary dictionary;
   for (std::vector<std::string>::iterator i = fields.begin();
        i != fields.end(); ++i) {
     std::string field(*i);
     std::vector<std::string> tokens;
-    if (Tokenize(field, "=", &tokens) != 2) {
+    size_t delim = field.find_first_of('=');
+    if (delim == std::string::npos) {
       DLOG(WARNING) << "Unexpected GAIA header field '" << field << "'.";
       continue;
     }
-    dictionary[tokens[0]] = tokens[1];
+    dictionary[field.substr(0, delim)] = net::UnescapeURLComponent(
+        field.substr(delim + 1), net::UnescapeRule::URL_SPECIAL_CHARS);
   }
   return dictionary;
 }
 
 // Returns the parameters contained in the X-Chrome-Manage-Accounts response
 // header.
 signin::ManageAccountsParams BuildManageAccountsParams(
     const std::string& header_value) {
   signin::ManageAccountsParams params;
   MirrorResponseHeaderDictionary header_dictionary =
@@ skipping 38 matching lines @@
 
 #if !defined(OS_ANDROID)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (browser) {
     BrowserWindow::AvatarBubbleMode bubble_mode;
     switch (service_type) {
       case signin::GAIA_SERVICE_TYPE_INCOGNITO:
         chrome::NewIncognitoWindow(browser);
         return;
       case signin::GAIA_SERVICE_TYPE_ADDSESSION:
-        bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN;
+        bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT;
         break;
       case signin::GAIA_SERVICE_TYPE_REAUTH:
         bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH;
         break;
       default:
         bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT;
     }
     browser->window()->ShowAvatarBubbleFromAvatarButton(
         bubble_mode, manage_accounts_params);
   }
 #else  // defined(OS_ANDROID)
   if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) {
+    GURL url(manage_accounts_params.continue_url.empty() ?
+        chrome::kChromeUINativeNewTabURL :
+        manage_accounts_params.continue_url);
     web_contents->OpenURL(content::OpenURLParams(
-        GURL(chrome::kChromeUINativeNewTabURL), content::Referrer(),
-        OFF_THE_RECORD, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
+        url, content::Referrer(), OFF_THE_RECORD,
+        ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
   } else {
     AccountManagementScreenHelper::OpenAccountManagementScreen(
         Profile::FromBrowserContext(web_contents->GetBrowserContext()),
         service_type);
   }
 #endif // OS_ANDROID
 }
 #endif // !defined(OS_IOS)
 
 bool IsDriveOrigin(const GURL& url) {
@@ skipping 105 matching lines @@
 
   params.child_id = child_id;
   params.route_id = route_id;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params));
 #endif  // defined(OS_IOS)
 }
 
 } // namespace signin