Add new methods to create constrained windows for print preview and release the internal TabConte...

chrome/browser/ui/login/login_prompt_ui.cc

 // Copyright (c) 2011 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/ui/login/login_prompt.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 40 matching lines @@
 
     SendResponse(request_id, base::RefCountedString::TakeString(&response));
   }
 
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE {
     return "text/html";
   }
 
   static void RegisterDataSource(Profile *profile) {
     ChromeURLDataManager* url_manager = profile->GetChromeURLDataManager();
-    LoginHandlerSource *source = new LoginHandlerSource();
+    LoginHandlerSource* source = new LoginHandlerSource();
     url_manager->AddDataSource(source);
   }
 
  private:
   virtual ~LoginHandlerSource() {}
 
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerSource);
 };
 
 class LoginHandlerHtml;
@@ skipping 62 matching lines @@
   // Send autofill data to HTML once the dialog is ready and the data is
   // available.
   void SendAutofillData();
 
   // Handle the request for autofill data from HTML.
   void GetAutofill(const ListValue* args) {
     ready_for_autofill_ = true;
     SendAutofillData();
   }
 
-  LoginHandlerHtml *login_handler_;
+  LoginHandlerHtml* login_handler_;
   std::string explanation_;
   bool closed_;
 
   bool has_autofill_;
   bool ready_for_autofill_;
   std::string autofill_username_;
   std::string autofill_password_;
 
   static const int kDialogWidth = 400;
   static const int kDialogHeight = 160;
@@ skipping 18 matching lines @@
   // LoginHandler method:
   virtual void BuildViewForPasswordManager(
       PasswordManager* manager, const string16& explanation) OVERRIDE;
 
   friend class LoginHandlerHtmlDelegate;
 
  protected:
   virtual ~LoginHandlerHtml() {}
 
  private:
-  LoginHandlerHtmlDelegate *delegate_;
+  LoginHandlerHtmlDelegate* delegate_;
 
   void FreeAndRelease() {
     SetDialog(NULL);
     SetModel(NULL);
     ReleaseSoon();
   }
 
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerHtml);
 };
 
@@ skipping 44 matching lines @@
 void LoginHandlerHtml::BuildViewForPasswordManager(
     PasswordManager* manager, const string16& explanation) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   TabContents* tab_contents = GetTabContentsForLogin();
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
   Profile* profile = wrapper->profile();
   LoginHandlerSource::RegisterDataSource(profile);
   delegate_ = new LoginHandlerHtmlDelegate(this, explanation);
-  ConstrainedWindow* dialog = ConstrainedHtmlUI::CreateConstrainedHtmlDialog(
-      profile, delegate_, wrapper);
+  ConstrainedHtmlUIDelegate* html_ui_delegate =
+      ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile, delegate_,
+                                                     wrapper);

[Evan Stade, 2011/10/13 23:59:14]

nit: don't need to store delegate variable

[Lei Zhang, 2011/10/14 17:31:05]

As in you prefer:

ConstrainedWindow* dialog =
ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile, delegate_,
wrapper)->window(); ?

or did you mean no need for |dialog| ?

+  ConstrainedWindow* dialog = html_ui_delegate->window();
 
   SetModel(manager);
   SetDialog(dialog);
 
   NotifyAuthNeeded();
 }
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerHtml(auth_info, request);
 }