More installer refactoring in the interest of fixing some bugs and cleaning t...

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 "chrome/installer/util/browser_distribution.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/utils.h"
 
 namespace {
 
 // Temporarily disable Ready Mode for 36 hours when the user so indicates.
 const int kTemporaryDeclineDurationMinutes = 60 * 36;
@@ skipping 155 matching lines @@
 void BrowserObserver::ShowPrompt() {
   // This pointer is self-managed and not guaranteed to survive handling of
   // Windows events.
   InfobarManager* infobar_manager = GetInfobarManager();
 
   if (infobar_manager) {
     // Owned by ready_mode_state
     scoped_ptr<RegistryReadyModeState::Observer> ready_mode_state_observer(
         new StateObserver(weak_ptr_factory_.GetWeakPtr()));
 
-    installer::ActivePackageProperties package_properties;
+    BrowserDistribution* dist =
+        BrowserDistribution::GetSpecificDistribution(
+            BrowserDistribution::CHROME_BINARIES);
 
     // Owned by infobar_content
     scoped_ptr<ReadyModeState> ready_mode_state(new RegistryReadyModeState(
-        package_properties.GetStateKey(),
+        dist->GetStateKey(),
         base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes),
         ready_mode_state_observer.release()));
 
     // Owned by infobar_manager
     scoped_ptr<InfobarContent> infobar_content(
         new ReadyPromptContent(ready_mode_state.release()));
 
     infobar_manager->Show(infobar_content.release(), TOP_INFOBAR);
   }
 }
@@ skipping 112 matching lines @@
 namespace ready_mode {
 
 // Determines the current Ready Mode state. If it is active, attempts to set up
 // prompting. If we cannot set up prompting, attempts to temporarily disable
 // Ready Mode. In the end, if Ready Mode is disabled, pass that information on
 // to the Delegate, so that it may disabled Chrome Frame functionality.
 void Configure(Delegate* chrome_frame, IWebBrowser2* web_browser) {
   // Take ownership of the delegate
   linked_ptr<Delegate> delegate(chrome_frame);
   chrome_frame = NULL;
+    BrowserDistribution* dist =
+        BrowserDistribution::GetSpecificDistribution(
+            BrowserDistribution::CHROME_BINARIES);
 
   RegistryReadyModeState ready_mode_state(
-      installer::ActivePackageProperties().GetStateKey(),
+      dist->GetStateKey(),
       base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes),
       NULL);  // NULL => no observer required
 
   ReadyModeStatus status = ready_mode_state.GetStatus();
 
   // If the user temporarily declined Chrome Frame, but the timeout has elapsed,
   // attempt to revert to active Ready Mode state.
   if (status == READY_MODE_TEMPORARY_DECLINE_EXPIRED) {
     ready_mode_state.ExpireTemporaryDecline();
     status = ready_mode_state.GetStatus();
   }
 
   // If Ready Mode is active, attempt to set up prompting.
   if (status == READY_MODE_ACTIVE) {
     if (!InstallPrompts(delegate, web_browser)) {
       // Failed to set up prompting. Turn off Ready Mode for now.
       ready_mode_state.TemporarilyDeclineChromeFrame();
       status = ready_mode_state.GetStatus();
     }
   }
 
   // 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