Invoke setup.exe to reenable updates when the update bubble is clicked.

chrome/browser/ui/views/outdated_upgrade_bubble_view.cc

 // Copyright (c) 2013 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/browser/ui/views/outdated_upgrade_bubble_view.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #endif
 
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
+#include "chrome/installer/util/google_update_util.h"
 #include "chrome/installer/util/install_util.h"
 #include "ui/gfx/icon_util.h"
 #endif
 
+using content::BrowserThread;
 using views::GridLayout;
 
 namespace {
 
 // Fixed width of the column holding the description label of the bubble.
 // TODO(mad): Make sure there is enough room for all languages.
 const int kWidthOfDescriptionText = 330;
 
 // We subtract 2 to account for the natural button padding, and
 // to bring the separation visually in line with the row separation
 // height.
 const int kButtonPadding = views::kRelatedButtonHSpacing - 2;
 
 // The URL to be used to re-install Chrome when auto-update failed for too long.
 const char kDownloadChromeUrl[] = "https://www.google.com/chrome/?&brand=CHWL"
     "&utm_campaign=en&utm_source=en-et-na-us-chrome-bubble&utm_medium=et";
 
 // The maximum number of ignored bubble we track in the NumLaterPerReinstall
 // histogram.
 const int kMaxIgnored = 50;
 // The number of buckets we want the NumLaterPerReinstall histogram to use.
 const int kNumIgnoredBuckets = 5;
 
 // Adds an elevation icon to |button| when running a system level install.
 void AddElevationIconIfNeeded(views::LabelButton* button) {
 #if defined(OS_WIN)
   if ((base::win::GetVersion() >= base::win::VERSION_VISTA) &&
       base::win::UserAccountControlIsEnabled()) {
-    base::FilePath exe_path;
-    PathService::Get(base::FILE_EXE, &exe_path);
-    if (InstallUtil::IsPerUserInstall(exe_path.value().c_str()))
-      return;
-
     // This code was lifted from chrome/browser/ui/views/infobars/infobar_view.
     // TODO(mad): Investigate the possibility of moving it to a common place.
     SHSTOCKICONINFO icon_info = { sizeof(SHSTOCKICONINFO) };
     // Even with the runtime guard above, we have to use GetProcAddress() here,
     // because otherwise the loader will try to resolve the function address on
     // startup, which will break on XP.
     typedef HRESULT (STDAPICALLTYPE *GetStockIconInfo)(SHSTOCKICONID, UINT,
                                                        SHSTOCKICONINFO*);
     GetStockIconInfo func = reinterpret_cast<GetStockIconInfo>(
         GetProcAddress(GetModuleHandle(L"shell32.dll"), "SHGetStockIconInfo"));
@@ skipping 166 matching lines @@
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "OutdatedUpgradeBubble.NumLaterPerReinstall", num_ignored_bubbles_,
           0, kMaxIgnored, kNumIgnoredBuckets);
       content::RecordAction(
           base::UserMetricsAction("OutdatedUpgradeBubble.Reinstall"));
       navigator_->OpenURL(content::OpenURLParams(GURL(kDownloadChromeUrl),
                                                  content::Referrer(),
                                                  NEW_FOREGROUND_TAB,
                                                  content::PAGE_TRANSITION_LINK,
                                                  false));
+#if defined(OS_WIN)
     } else {
       DCHECK(UpgradeDetector::GetInstance()->is_outdated_install_no_au());
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "OutdatedUpgradeBubble.NumLaterPerEnableAU", num_ignored_bubbles_,
           0, kMaxIgnored, kNumIgnoredBuckets);
       content::RecordAction(
           base::UserMetricsAction("OutdatedUpgradeBubble.EnableAU"));
-      // TODO(robertshield): Make a call to GoogleUpdateSettings to enable
-      // auto-update.
+      // Record that the autoupdate flavour of the dialog has been shown.
       if (g_browser_process->local_state()) {
         g_browser_process->local_state()->SetBoolean(
             prefs::kAttemptedToEnableAutoupdate, true);
       }
+
+      // Re-enable updates by shelling out to setup.exe in the blocking pool.
+      BrowserThread::PostBlockingPoolTask(FROM_HERE,
+          base::Bind(&google_update::ElevateIfNeededToReenableUpdates));
+#endif  // defined(OS_WIN)
     }
   } else {
     DCHECK_EQ(later_button_, sender);
     content::RecordAction(
         base::UserMetricsAction("OutdatedUpgradeBubble.Later"));
   }
   GetWidget()->Close();
 }