Identity API: switch WebAuthFlow dialog to component app

chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc

 // Copyright (c) 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/extensions/api/identity/gaia_web_auth_flow.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 
 namespace extensions {
 
 GaiaWebAuthFlow::GaiaWebAuthFlow(Delegate* delegate,
                                  Profile* profile,
-                                 chrome::HostDesktopType host_desktop_type,
                                  const std::string& extension_id,
                                  const OAuth2Info& oauth2_info)
     : delegate_(delegate),
-      profile_(profile),
-      host_desktop_type_(host_desktop_type) {
+      profile_(profile) {
   const char kOAuth2RedirectPathFormat[] = "/%s#";
   const char kOAuth2AuthorizeFormat[] =
       "%s?response_type=token&approval_prompt=force&authuser=0&"
       "client_id=%s&"
       "scope=%s&"
       "origin=chrome-extension://%s/&"
       "redirect_uri=%s:/%s";
 
   std::vector<std::string> client_id_parts;
   base::SplitString(oauth2_info.client_id, '.', &client_id_parts);
@@ skipping 38 matching lines @@
   web_flow_ = CreateWebAuthFlow(merge_url);
   web_flow_->Start();
 }
 
 void GaiaWebAuthFlow::OnUbertokenFailure(const GoogleServiceAuthError& error) {
   delegate_->OnGaiaFlowFailure(
       GaiaWebAuthFlow::SERVICE_AUTH_ERROR, error, std::string());
 }
 
 void GaiaWebAuthFlow::OnAuthFlowFailure(WebAuthFlow::Failure failure) {
-  DCHECK(failure == WebAuthFlow::WINDOW_CLOSED);
+  GaiaWebAuthFlow::Failure gaia_failure;
+
+  switch (failure) {
+    case WebAuthFlow::WINDOW_CLOSED:
+      gaia_failure = GaiaWebAuthFlow::WINDOW_CLOSED;
+      break;
+    case WebAuthFlow::LOAD_FAILED:
+      gaia_failure = GaiaWebAuthFlow::LOAD_FAILED;
+      break;
+    default:
+      NOTREACHED() << "Unexpected error from web auth flow: " << failure;
+      gaia_failure = GaiaWebAuthFlow::LOAD_FAILED;
+      break;
+  }
+
   delegate_->OnGaiaFlowFailure(
-      GaiaWebAuthFlow::WINDOW_CLOSED,
+      gaia_failure,
       GoogleServiceAuthError(GoogleServiceAuthError::NONE),
       std::string());
 }
 
 void GaiaWebAuthFlow::OnAuthFlowURLChange(const GURL& url) {
   const char kOAuth2RedirectAccessTokenKey[] = "access_token";
   const char kOAuth2RedirectErrorKey[] = "error";
   const char kOAuth2ExpiresInKey[] = "expires_in";
 
   // The format of the target URL is:
@@ skipping 49 matching lines @@
   std::string prefix(kRedirectPrefix);
 
   if (StartsWithASCII(title, prefix, true)) {
     GURL url(title.substr(prefix.length(), std::string::npos));
     if (url.is_valid())
       OnAuthFlowURLChange(url);
   }
 }
 
 scoped_ptr<WebAuthFlow> GaiaWebAuthFlow::CreateWebAuthFlow(GURL url) {
-  gfx::Rect initial_bounds;
   return scoped_ptr<WebAuthFlow>(new WebAuthFlow(this,
                                                  profile_,
                                                  url,
-                                                 WebAuthFlow::INTERACTIVE,
-                                                 initial_bounds,
-                                                 host_desktop_type_));
+                                                 WebAuthFlow::INTERACTIVE));
 }
 
 }  // extensions