Enable EULA dialog to be shown from metro Chrome.

chrome/installer/util/google_update_settings.cc

 // Copyright (c) 2012 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/installer/util/google_update_settings.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 20 matching lines @@
     L"SOFTWARE\\Policies\\Google\\Update";
 const wchar_t kGoogleUpdateUpdatePolicyValue[] = L"UpdateDefault";
 const wchar_t kGoogleUpdateUpdateOverrideValuePrefix[] = L"Update";
 const GoogleUpdateSettings::UpdatePolicy kGoogleUpdateDefaultUpdatePolicy =
 #if defined(GOOGLE_CHROME_BUILD)
     GoogleUpdateSettings::AUTOMATIC_UPDATES;
 #else
     GoogleUpdateSettings::UPDATES_DISABLED;
 #endif
 
-// An list of search results in increasing order of desirability.
-enum EulaSearchResult {
-  NO_SETTING,
-  FOUND_CLIENT_STATE,
-  FOUND_OPPOSITE_SETTING,
-  FOUND_SAME_SETTING
-};
-
 bool ReadGoogleUpdateStrKey(const wchar_t* const name, std::wstring* value) {
   // The registry functions below will end up going to disk.  Do this on another
   // thread to avoid slowing the IO thread.  http://crbug.com/62121
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring reg_path = dist->GetStateKey();
   RegKey key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_READ);
   if (key.ReadValue(name, value) != ERROR_SUCCESS) {
     RegKey hklm_key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
     return (hklm_key.ReadValue(name, value) == ERROR_SUCCESS);
@@ skipping 42 matching lines @@
 
 bool RemoveGoogleUpdateStrKey(const wchar_t* const name) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring reg_path = dist->GetStateKey();
   RegKey key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_READ | KEY_WRITE);
   if (!key.HasValue(name))
     return true;
   return (key.DeleteValue(name) == ERROR_SUCCESS);
 }
 
-EulaSearchResult HasEULASetting(HKEY root, const std::wstring& state_key,

[grt (UTC plus 2), 2012/09/20 15:58:31]

YEAH!

[robertshield, 2012/09/21 01:24:43]

\o/

-                                bool setting) {
-  RegKey key;
-  DWORD previous_value = setting ? 1 : 0;
-  if (key.Open(root, state_key.c_str(), KEY_QUERY_VALUE) != ERROR_SUCCESS)
-    return NO_SETTING;
-  if (key.ReadValueDW(google_update::kRegEULAAceptedField,
-                      &previous_value) != ERROR_SUCCESS)
-    return FOUND_CLIENT_STATE;
-
-  return ((previous_value != 0) == setting) ?
-      FOUND_SAME_SETTING : FOUND_OPPOSITE_SETTING;
-}
-
 bool GetChromeChannelInternal(bool system_install,
                               bool add_multi_modifier,
                               string16* channel) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (dist->GetChromeChannel(channel)) {
     return true;
   }
 
   // The registry functions below will end up going to disk.  Do this on another
   // thread to avoid slowing the IO thread.  http://crbug.com/62121
@@ skipping 522 matching lines @@
                                data);
 }
 
 bool GoogleUpdateSettings::GetUpdateDetail(bool system_install,
                                            ProductData* data) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return GetUpdateDetailForApp(system_install,
                                dist->GetAppGuid().c_str(),
                                data);
 }