Make the new Gaia password separated signin flow modal.

chrome/browser/signin/signin_promo.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_promo.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
+#include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/options/core_options_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
@@ skipping 184 matching lines @@
       return continue_url;
   }
 
   return GURL();
 }
 
 GURL GetSigninPartitionURL() {
   return GURL("chrome-guest://chrome-signin/?");
 }
 
+GURL GetSigninURLFromBubbleViewMode(Profile* profile,
+                                    profiles::BubbleViewMode mode) {
+  switch (mode) {
+    case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN:
+      return GetPromoURL(signin_metrics::SOURCE_AVATAR_BUBBLE_SIGN_IN,
+                         false /* auto_close */,
+                         true /* is_constrained */);
+      break;
+    case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT:
+      return GetPromoURL(signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT,
+                         false /* auto_close */,
+                         true /* is_constrained */);
+      break;
+    case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: {
+      const SigninErrorController* error_controller =
+          SigninErrorControllerFactory::GetForProfile(profile);
+      CHECK(error_controller);
+      DCHECK(error_controller->HasError());
+      return GetReauthURL(profile, error_controller->error_account_id());
+      break;
+    }
+    default:
+      NOTREACHED() << "Called with invalid mode=" << mode;
+      return GURL();
+  }
+}
+
 signin_metrics::Source GetSourceForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeySource, &value)) {
     int source = 0;
     if (base::StringToInt(value, &source) &&
         source >= signin_metrics::SOURCE_START_PAGE &&
         source < signin_metrics::SOURCE_UNKNOWN) {
       return static_cast<signin_metrics::Source>(source);
     }
   }
@@ skipping 27 matching lines @@
 
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
   registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
 }
 
 }  // namespace signin