Identity API: Change WebAuthFlow to use <webview> instead of a normal browser pop-up.

chrome/browser/extensions/api/identity/identity_api.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/extensions/api/identity/identity_api.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
-#include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/api/identity.h"
 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/page_transition_types.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/window_open_disposition.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
 namespace extensions {
 
 namespace identity_constants {
 const char kInvalidClientId[] = "Invalid OAuth2 Client ID.";
 const char kInvalidScopes[] = "Invalid OAuth2 scopes.";
 const char kAuthFailure[] = "OAuth2 request failed: ";
 const char kNoGrant[] = "OAuth2 not granted or revoked.";
 const char kUserRejected[] = "The user did not approve access.";
 const char kUserNotSignedIn[] = "The user is not signed in.";
 const char kInteractionRequired[] = "User interaction required.";
 const char kInvalidRedirect[] = "Did not redirect to the right URL.";
 const char kOffTheRecord[] = "Identity API is disabled in incognito windows.";
+const char kPageLoadFailure[] = "Authorization page could not be loaded.";
 
 const int kCachedIssueAdviceTTLSeconds = 1;
 }  // namespace identity_constants
 
 namespace {
 
 static const char kChromiumDomainRedirectUrlPattern[] =
     "https://%s.chromiumapp.org/";
 
 }  // namespace
@@ skipping 325 matching lines @@
 
   GURL auth_url(params->details.url);
   WebAuthFlow::Mode mode =
       params->details.interactive && *params->details.interactive ?
       WebAuthFlow::INTERACTIVE : WebAuthFlow::SILENT;
 
   // Set up acceptable target URLs. (Does not include chrome-extension
   // scheme for this version of the API.)
   InitFinalRedirectURLPrefixes(GetExtension()->id());
 
-  gfx::Rect initial_bounds;
+  AddRef();  // Balanced in OnAuthFlowClosed
 
-  AddRef();  // Balanced in OnAuthFlowSuccess/Failure.
-
-  Browser* current_browser = this->GetCurrentBrowser();
-  chrome::HostDesktopType host_desktop_type = current_browser ?
-      current_browser->host_desktop_type() : chrome::GetActiveDesktop();
-  auth_flow_.reset(new WebAuthFlow(
-      this, profile(), auth_url, mode, initial_bounds,
-      host_desktop_type));
+  auth_flow_.reset(new WebAuthFlow(this, profile(), auth_url, mode));
   auth_flow_->Start();
   return true;
 }
 
 bool IdentityLaunchWebAuthFlowFunction::IsFinalRedirectURL(
     const GURL& url) const {
   std::vector<GURL>::const_iterator iter;
   for (iter = final_prefixes_.begin(); iter != final_prefixes_.end(); ++iter) {
     if (url.GetWithEmptyPath() == *iter) {
       return true;
@@ skipping 16 matching lines @@
 
 void IdentityLaunchWebAuthFlowFunction::OnAuthFlowFailure(
     WebAuthFlow::Failure failure) {
   switch (failure) {
     case WebAuthFlow::WINDOW_CLOSED:
       error_ = identity_constants::kUserRejected;
       break;
     case WebAuthFlow::INTERACTION_REQUIRED:
       error_ = identity_constants::kInteractionRequired;
       break;
+    case WebAuthFlow::LOAD_FAILED:
+      error_ = std::string(identity_constants::kPageLoadFailure);
+      break;
     default:
       NOTREACHED() << "Unexpected error from web auth flow: " << failure;
       error_ = identity_constants::kInvalidRedirect;
       break;
   }
   SendResponse(false);
-  Release();  // Balanced in RunImpl.
+  auth_flow_->Close();
 }
 
 void IdentityLaunchWebAuthFlowFunction::OnAuthFlowURLChange(
     const GURL& redirect_url) {
   if (IsFinalRedirectURL(redirect_url)) {
     SetResult(Value::CreateStringValue(redirect_url.spec()));
     SendResponse(true);
-    Release();  // Balanced in RunImpl.
+    auth_flow_->Close();
   }
 }
 
+void IdentityLaunchWebAuthFlowFunction::OnAuthFlowClosed() {
+  Release();  // Balanced in RunImpl.
+}
+
 IdentityTokenCacheValue::IdentityTokenCacheValue()
     : status_(CACHE_STATUS_NOTFOUND) {
 }
 
 IdentityTokenCacheValue::IdentityTokenCacheValue(
     const IssueAdviceInfo& issue_advice) : status_(CACHE_STATUS_ADVICE),
                                            issue_advice_(issue_advice) {
   expiration_time_ = base::Time::Now() + base::TimeDelta::FromSeconds(
       identity_constants::kCachedIssueAdviceTTLSeconds);
 }
@@ skipping 152 matching lines @@
     const IdentityAPI::TokenCacheKey& rhs) const {
   if (extension_id < rhs.extension_id)
     return true;
   else if (rhs.extension_id < extension_id)
     return false;
 
   return scopes < rhs.scopes;
 }
 
 }  // namespace extensions