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

chrome_frame/ready_mode/ready_mode.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_frame/ready_mode/ready_mode.h"
 
 #include <atlbase.h>
 #include <shlguid.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/linked_ptr.h"
 #include "base/scoped_ptr.h"
 #include "base/weak_ptr.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/win_util.h"
 #include "net/base/registry_controlled_domain.h"
 #include "chrome/installer/util/package_properties.h"
 #include "chrome_frame/infobars/infobar_manager.h"
 #include "chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.h"
 #include "chrome_frame/ready_mode/internal/ready_prompt_content.h"
 #include "chrome_frame/ready_mode/internal/registry_ready_mode_state.h"
+#include "chrome_frame/ready_mode/internal/url_launcher.h"
 #include "chrome_frame/utils.h"
 
 namespace {
 
 // Temporarily disable Ready Mode for 36 hours when the user so indicates.
 const int kTemporaryDeclineDurationMinutes = 60 * 36;
 
 class BrowserObserver;
 
 // A helper for BrowserObserver to observe the user's choice in the Ready Mode
@@ skipping 49 matching lines @@
   GURL rendered_url_;
   linked_ptr<ready_mode::Delegate> chrome_frame_;
   base::win::ScopedComPtr<IWebBrowser2> web_browser_;
   // The adapter owns us, so we use a weak reference
   ReadyModeWebBrowserAdapter* adapter_;
   base::WeakPtrFactory<BrowserObserver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserObserver);
 };  // class BrowserObserver
 
+// Implements launching of a URL in an instance of IWebBrowser2.
+class UrlLauncherImpl : public UrlLauncher {
+ public:
+  explicit UrlLauncherImpl(IWebBrowser2* web_browser);
+
+  // UrlLauncher implementation
+  void LaunchUrl(const std::wstring& url);
+
+ private:
+  base::win::ScopedComPtr<IWebBrowser2> web_browser_;
+};  // class UrlLaucherImpl
+
+UrlLauncherImpl::UrlLauncherImpl(IWebBrowser2* web_browser) {
+  DCHECK(web_browser);
+  web_browser->AddRef();

[tommi (sloooow) - chröme, 2011/01/24 17:54:23]

use the = operator?  (it comes from the scoped_refptr class)

[erikwright (departed), 2011/01/24 18:55:19]

Done.

+  web_browser_.Attach(web_browser);
+}
+
+void UrlLauncherImpl::LaunchUrl(const std::wstring& url) {
+  VARIANT flags = { VT_I4 };
+  V_I4(&flags) = navOpenInNewWindow;
+  base::win::ScopedBstr location(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;
+}
+
 StateObserver::StateObserver(
     const base::WeakPtr<BrowserObserver>& ready_mode_ui)
     : ready_mode_ui_(ready_mode_ui) {
 }
 
 StateObserver::~StateObserver() {
 }
 
 void StateObserver::OnStateChange(ReadyModeStatus status) {
   if (ready_mode_ui_ == NULL)
@@ skipping 90 matching lines @@
         new StateObserver(weak_ptr_factory_.GetWeakPtr()));
 
     installer::ActivePackageProperties package_properties;
 
     // Owned by infobar_content
     scoped_ptr<ReadyModeState> ready_mode_state(new RegistryReadyModeState(
         package_properties.GetStateKey(),
         base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes),
         ready_mode_state_observer.release()));
 
+    // Owned by infobar_content
+    scoped_ptr<UrlLauncher> url_launcher(new UrlLauncherImpl(web_browser_));
+
     // Owned by infobar_manager
-    scoped_ptr<InfobarContent> infobar_content(
-        new ReadyPromptContent(ready_mode_state.release()));
+    scoped_ptr<InfobarContent> infobar_content(new ReadyPromptContent(
+        ready_mode_state.release(), url_launcher.release()));
 
     infobar_manager->Show(infobar_content.release(), TOP_INFOBAR);
   }
 }
 
 void BrowserObserver::Hide() {
   InfobarManager* infobar_manager = GetInfobarManager();
   if (infobar_manager)
     infobar_manager->HideAll();
 }
@@ skipping 137 matching lines @@
     }
   }
 
   // Depending on the state we finally end up in, tell our Delegate to disable
   // Chrome Frame functionality.
   if (ShouldDisableChromeFrame(status))
     delegate->DisableChromeFrame();
 }
 
 }  // namespace ready_mode