Merge 162639 - Implement size and position support for launchWebAuthFlow.

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 "base/values.h"
 #include "chrome/common/extensions/api/experimental_identity.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
@@ skipping 20 matching lines @@
 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 kInvalidRedirect[] = "Did not redirect to the right URL.";
 }
 
 namespace GetAuthToken = extensions::api::experimental_identity::GetAuthToken;
 namespace LaunchWebAuthFlow =
     extensions::api::experimental_identity::LaunchWebAuthFlow;
+namespace identity = extensions::api::experimental_identity;
 
 IdentityGetAuthTokenFunction::IdentityGetAuthTokenFunction()
     : interactive_(false) {}
 IdentityGetAuthTokenFunction::~IdentityGetAuthTokenFunction() {}
 
 bool IdentityGetAuthTokenFunction::RunImpl() {
   scoped_ptr<GetAuthToken::Params> params(GetAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->details.get() && params->details->interactive.get())
     interactive_ = *params->details->interactive;
@@ skipping 167 matching lines @@
   return token_service->HasOAuthLoginToken();
 }
 
 IdentityLaunchWebAuthFlowFunction::IdentityLaunchWebAuthFlowFunction() {}
 IdentityLaunchWebAuthFlowFunction::~IdentityLaunchWebAuthFlowFunction() {}
 
 bool IdentityLaunchWebAuthFlowFunction::RunImpl() {
   scoped_ptr<LaunchWebAuthFlow::Params> params(
       LaunchWebAuthFlow::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
+  const identity::WebAuthFlowDetails& details = params->details;
 
-  GURL auth_url(params->details.url);
+  GURL auth_url(details.url);
   WebAuthFlow::Mode mode =
-      params->details.interactive.get() && *params->details.interactive ?
+      details.interactive && *details.interactive ?
       WebAuthFlow::INTERACTIVE : WebAuthFlow::SILENT;
 
+  // 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.
   auth_flow_.reset(new WebAuthFlow(
-      this, profile(), GetExtension()->id(), auth_url, mode));
+      this, profile(), GetExtension()->id(), auth_url, mode, initial_bounds));
   auth_flow_->Start();
   return true;
 }
 
 void IdentityLaunchWebAuthFlowFunction::OnAuthFlowSuccess(
     const std::string& redirect_url) {
   SetResult(Value::CreateStringValue(redirect_url));
   SendResponse(true);
   Release();  // Balanced in RunImpl.
 }
 
 void IdentityLaunchWebAuthFlowFunction::OnAuthFlowFailure() {
   error_ = identity_constants::kInvalidRedirect;
   SendResponse(false);
   Release();  // Balanced in RunImpl.
 }
 
 }  // namespace extensions