Merge 162639 - Implement size and position support for launchWebAuthFlow.

chrome/browser/extensions/api/identity/web_auth_flow.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/web_auth_flow.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop.h"
@@ skipping 30 matching lines @@
 
 }  // namespace
 
 namespace extensions {
 
 WebAuthFlow::WebAuthFlow(
     Delegate* delegate,
     Profile* profile,
     const std::string& extension_id,
     const GURL& provider_url,
-    Mode mode)
+    Mode mode,
+    const gfx::Rect& initial_bounds)
     : delegate_(delegate),
       profile_(profile),
       provider_url_(provider_url),
       mode_(mode),
+      initial_bounds_(initial_bounds),
       contents_(NULL),
       tab_contents_(NULL) {
   InitValidRedirectUrlPrefixes(extension_id);
 }
 
 WebAuthFlow::~WebAuthFlow() {
   if (tab_contents_) {
     tab_contents_->web_contents()->Close();
   }
   if (contents_) {
@@ skipping 37 matching lines @@
 }
 
 WebContents* WebAuthFlow::CreateWebContents() {
   return WebContents::Create(profile_, NULL, MSG_ROUTING_NONE, NULL);
 }
 
 void WebAuthFlow::ShowAuthFlowPopup() {
   // Pass ownership of WebContents to TabContents.
   tab_contents_ = TabContents::Factory::CreateTabContents(contents_);
   contents_ = NULL;
-  Browser* browser = new Browser(Browser::CreateParams(
-      Browser::TYPE_POPUP, profile_));
+  Browser::CreateParams browser_params(Browser::TYPE_POPUP, profile_);
+  browser_params.initial_bounds = initial_bounds_;
+  Browser* browser = new Browser(browser_params);
   chrome::NavigateParams params(browser, tab_contents_);
   params.disposition = CURRENT_TAB;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
   // Observe method will be called before URLs are loaded. That is where
   // we check for redirect to the right URL.
 }
 
 bool WebAuthFlow::BeforeUrlLoaded(const GURL& url) {
   if (IsValidRedirectUrl(url)) {
@@ skipping 38 matching lines @@
     break;
     case content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT: {
       ResourceRedirectDetails* redirect_details =
           content::Details<ResourceRedirectDetails>(details).ptr();
       if (redirect_details != NULL)
         BeforeUrlLoaded(redirect_details->new_url);
     }
     break;
     case content::NOTIFICATION_WEB_CONTENTS_DESTROYED: {
       // User closed the auth flow window; report a failure.
+      contents_ = NULL;
+      tab_contents_ = NULL;
       ReportResult(GURL());
     }
     break;
     default:
       NOTREACHED() << "Got a notification that we did not register for: "
                    << type;
       break;
   }
 }
 
@@ skipping 27 matching lines @@
 
 void WebAuthFlow::InitValidRedirectUrlPrefixes(
     const std::string& extension_id) {
   valid_prefixes_.push_back(base::StringPrintf(
       kChromeExtensionSchemeUrlPattern, extension_id.c_str()));
   valid_prefixes_.push_back(base::StringPrintf(
       kChromiumDomainRedirectUrlPattern, extension_id.c_str()));
 }
 
 }  // namespace extensions