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

chrome/browser/extensions/api/identity/experimental_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/experimental_identity_api.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 251 matching lines @@
     error_ = identity_constants::kOffTheRecord;
     return false;
   }
 
   scoped_ptr<identity_exp::LaunchWebAuthFlow::Params> params(
       identity_exp::LaunchWebAuthFlow::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   const identity_exp::ExperimentalWebAuthFlowDetails& details = params->details;
 
   GURL auth_url(params->details.url);
-  WebAuthFlow::Mode mode =
+  ExperimentalWebAuthFlow::Mode mode =
       params->details.interactive && *params->details.interactive ?
-      WebAuthFlow::INTERACTIVE : WebAuthFlow::SILENT;
+      ExperimentalWebAuthFlow::INTERACTIVE : ExperimentalWebAuthFlow::SILENT;
 
   // Set up acceptable target URLs. (Includes chrome-extension scheme
   // for this version of the API.)
   InitFinalRedirectURLPrefixes(GetExtension()->id());
 
   // The bounds attributes are optional, but using 0 when they're not available
   // does the right thing.
   gfx::Rect initial_bounds;
   if (details.width)
     initial_bounds.set_width(*details.width);
   if (details.height)
     initial_bounds.set_height(*details.height);
   if (details.left)
     initial_bounds.set_x(*details.left);
   if (details.top)
     initial_bounds.set_y(*details.top);
 
   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(
+  auth_flow_.reset(new ExperimentalWebAuthFlow(
       this, profile(), auth_url, mode, initial_bounds,
       host_desktop_type));
   auth_flow_->Start();
   return true;
 }
 
 bool ExperimentalIdentityLaunchWebAuthFlowFunction::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;
     }
   }
   return false;
 }
 
 void ExperimentalIdentityLaunchWebAuthFlowFunction::
     InitFinalRedirectURLPrefixes(const std::string& extension_id) {
   final_prefixes_.push_back(Extension::GetBaseURLFromExtensionId(extension_id));
   final_prefixes_.push_back(GURL(base::StringPrintf(
       kChromiumDomainRedirectUrlPattern, extension_id.c_str())));
 }
 
 void ExperimentalIdentityLaunchWebAuthFlowFunction::OnAuthFlowFailure(
-    WebAuthFlow::Failure failure) {
+    ExperimentalWebAuthFlow::Failure failure) {
   switch (failure) {
-    case WebAuthFlow::WINDOW_CLOSED:
+    case ExperimentalWebAuthFlow::WINDOW_CLOSED:
       error_ = identity_constants::kUserRejected;
       break;
-    case WebAuthFlow::INTERACTION_REQUIRED:
+    case ExperimentalWebAuthFlow::INTERACTION_REQUIRED:
       error_ = identity_constants::kInteractionRequired;
       break;
     default:
       NOTREACHED() << "Unexpected error from web auth flow: " << failure;
       error_ = identity_constants::kInvalidRedirect;
       break;
   }
   SendResponse(false);
   Release();  // Balanced in RunImpl.
 }
 
 void ExperimentalIdentityLaunchWebAuthFlowFunction::OnAuthFlowURLChange(
     const GURL& redirect_url) {
   if (IsFinalRedirectURL(redirect_url)) {
     SetResult(Value::CreateStringValue(redirect_url.spec()));
     SendResponse(true);
     Release();  // Balanced in RunImpl.
   }
 }
 
 void ExperimentalIdentityLaunchWebAuthFlowFunction::
     InitFinalRedirectURLPrefixesForTest(const std::string& extension_id) {
   final_prefixes_.clear();
   InitFinalRedirectURLPrefixes(extension_id);
 }
 
 }  // namespace extensions