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

chrome_frame/ready_mode/internal/ready_prompt_window.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_window.h"
 
+#include <Shellapi.h>  // Must appear before atlctrlx.h
+#include <atlctrls.h>

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

I think you want to include atlapp.h and atlwin.h first. (If you look at the top
of the headers, they tell you which files they need including).

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

They are already in ready_prompt_window.h (the declaration for this class, so I
assume it's not standard practice to repeat them here).

+
+// These seem to be required by atlctrlx?

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

Anyone know why atlctrlx.h is requiring min and max in the global namespace and
where I'm expected to get them from?

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

Follow the above comment, and probably won't need this.

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

Sadly, I still get the following:


1>s:\src\chromium\src\third_party\wtl\include\atlctrlx.h(4190) : error C3861:
'min': identifier not found
1>        s:\src\chromium\src\third_party\wtl\include\atlctrlx.h(4137) : while
compiling class template member function 'void
WTL::CTabViewImpl<T>::BuildWindowMenu(HMENU,int,bool,bool,bool,bool)'
1>        with
1>        [
1>            T=WTL::CTabView
1>        ]
1>        s:\src\chromium\src\third_party\wtl\include\atlctrlx.h(4817) : see
reference to class template instantiation 'WTL::CTabViewImpl<T>' being compiled
1>        with
1>        [
1>            T=WTL::CTabView
1>        ]
1>s:\src\chromium\src\third_party\wtl\include\atlctrlx.h(4190) : error C3861:
'min': identifier not found

+template<class A>
+A min(A const& a, A const& b) { return a < b ? a : b; }
+
+template<class A>
+A max(A const& a, A const& b) { return a > b ? a : b; }
+
+#include <atlctrlx.h>
+#include <Exdisp.h>
+
 #include "base/compiler_specific.h"
+#include "base/win/scoped_bstr.h"
+#include "base/win/scoped_comptr.h"
 #include "chrome_frame/ready_mode/internal/ready_mode_state.h"
+#include "chrome_frame/simple_resource_loader.h"
+#include "grit/chromium_strings.h"
 
 ReadyPromptWindow::ReadyPromptWindow()
     : frame_(NULL),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
+ReadyPromptWindow::~ReadyPromptWindow() {
+}
 
 base::WeakPtr<ReadyPromptWindow> ReadyPromptWindow::Initialize(
-    InfobarContent::Frame* frame, ReadyModeState* ready_mode_state) {
+    InfobarContent::Frame* frame, ReadyModeState* ready_mode_state,
+    IWebBrowser2* web_browser) {
   DCHECK(frame != NULL);
   DCHECK(frame_ == NULL);
   DCHECK(ready_mode_state != NULL);
   DCHECK(ready_mode_state_ == NULL);
+  DCHECK(web_browser != NULL);
+  DCHECK(web_browser_ == NULL);

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

if Initialize can't be called twice, consider having an intialized_ var that
gets set and DCHECKing on that instead of having all these doubled checks.

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

I think this is resolved with the change to factory method.

 
   frame_ = frame;
   ready_mode_state_.reset(ready_mode_state);
+  web_browser->AddRef();
+  web_browser_.Attach(web_browser);
 
   DCHECK(!IsWindow());
 
   if (Create(frame->GetFrameWindow()) == NULL) {
     DPLOG(ERROR) << "Failed to create HWND for ReadyPromptWindow.";
     delete this;
     return base::WeakPtr<ReadyPromptWindow>();
   }
 
+  // Subclass the "Learn more." text to make it behave like a link. Clicks are
+  // routed to OnLearnMore().
+  ATL::CWindow rte = GetDlgItem(IDC_PROMPT_LINK);
+  link_.reset(new WTL::CHyperLink());
+  link_->SubclassWindow(rte);
+  link_->SetHyperLinkExtendedStyle(HLINK_NOTIFYBUTTON, HLINK_NOTIFYBUTTON);
+
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void ReadyPromptWindow::OnDestroy() {
   frame_ = NULL;
 }
 
 BOOL ReadyPromptWindow::OnInitDialog(CWindow wndFocus, LPARAM lInitParam) {
   DlgResize_Init(false);  // false => 'no gripper'
   return TRUE;
@@ skipping 19 matching lines @@
 
 LRESULT ReadyPromptWindow::OnNo(WORD /*wNotifyCode*/,
                                 WORD /*wID*/,
                                 HWND /*hWndCtl*/,
                                 BOOL& /*bHandled*/) {
   frame_->CloseInfobar();
   ready_mode_state_->PermanentlyDeclineChromeFrame();
   return 0;
 }
 
+LRESULT ReadyPromptWindow::OnLearnMore(WORD /*wParam*/,
+                                       LPNMHDR /*lParam*/,
+                                       BOOL& /*bHandled*/) {
+  VARIANT flags = { VT_I4 };
+  V_I4(&flags) = navOpenInNewWindow;
+  base::win::ScopedBstr location(SimpleResourceLoader::Get(
+      IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL).c_str());
+
+  HRESULT hr = web_browser_->Navigate(location, &flags, NULL, NULL, NULL);
+  DLOG_IF(ERROR, FAILED(hr)) << "Failed to invoke Navigate on IWebBrowser2. "
+                             << "Error: " << hr;
+  return 0;
+}
+
 void ReadyPromptWindow::OnFinalMessage(HWND) {
   delete this;
 }