Update the Ready Mode UI in response to feedback from UI leads, Chrome Frame ...

chrome_frame/ready_mode/internal/ready_prompt_content.cc

 // Copyright (c) 2010 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_frame/ready_mode/internal/ready_prompt_content.h"
 

[erikwright (departed), 2011/01/24 06:58:39]

Oops. This is missing atlbase.h, atlwin.h, and Exdisp.h.

[robertshield, 2011/01/24 16:10:21]

Add them? ;-)

[erikwright (departed), 2011/01/24 17:14:01]

Yeah. Wanted to get this out for initial feedback ASAP. My workstation crashed
before I discovered this.

Anyway, not needed now.

-#include <atlbase.h>
-#include <atlwin.h>
-
 #include "base/logging.h"
 #include "chrome_frame/ready_mode/internal/ready_mode_state.h"
 #include "chrome_frame/ready_mode/internal/ready_prompt_window.h"
 
-ReadyPromptContent::ReadyPromptContent(ReadyModeState* ready_mode_state)
+ReadyPromptContent::ReadyPromptContent(ReadyModeState* ready_mode_state,
+                                       IWebBrowser2* web_browser)
     : ready_mode_state_(ready_mode_state) {
+  web_browser->AddRef();
+  web_browser_.Attach(web_browser);
 }
 
 ReadyPromptContent::~ReadyPromptContent() {
   if (window_ != NULL && window_->IsWindow()) {
     // The window must discard its ContentFrame pointer at this time.
     window_->DestroyWindow();
     window_.reset();
   }
 }
 
 bool ReadyPromptContent::InstallInFrame(Frame* frame) {
   DCHECK(window_ == NULL);
   DCHECK(ready_mode_state_ != NULL);
 
   // The window owns itself upon call to Initialize.
   ReadyPromptWindow* new_window_ = new ReadyPromptWindow();

[robertshield, 2011/01/24 16:10:21]

new_window_ is not a member so shouldn't have the trailing underscore.

-  window_ = new_window_->Initialize(frame, ready_mode_state_.release());
+  window_ = new_window_->Initialize(frame, ready_mode_state_.release(),
+                                    web_browser_);
 
   return window_ != NULL;
 }
 
 void ReadyPromptContent::SetDimensions(const RECT& dimensions) {
   if (window_ != NULL && window_->IsWindow()) {
     window_->SetWindowPos(HWND_TOP, &dimensions,
                           ::IsRectEmpty(&dimensions) ? SWP_HIDEWINDOW :
                                                        SWP_SHOWWINDOW);
   }
@@ skipping 50 matching lines @@
   if (window_ == NULL || !window_->IsWindow()) {
     return 0;
   }
   RECT dialog_dimensions = {0, 0, 0, 0};
 
   if (GetDialogTemplateDimensions(window_.get(), &dialog_dimensions))
     return width == 0 ? dialog_dimensions.right : dialog_dimensions.bottom;
   else
     return width == 0 ? 0 : 39;
 }