Show a modified outdated upgrade Bubble for non-enterprise users without auto-update

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"
 
 #include "base/metrics/histogram.h"
+#include "base/path_service.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/installer/util/install_util.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 "ui/gfx/icon_util.h"
+#endif
+
 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"));
+    if (SUCCEEDED((*func)(SIID_SHIELD, SHGSI_ICON | SHGSI_SMALLICON,
+                          &icon_info))) {
+      scoped_ptr<SkBitmap> icon(IconUtil::CreateSkBitmapFromHICON(
+          icon_info.hIcon, gfx::Size(GetSystemMetrics(SM_CXSMICON),
+                                     GetSystemMetrics(SM_CYSMICON))));
+      if (icon.get()) {
+        button->SetImage(views::Button::STATE_NORMAL,
+                         gfx::ImageSkia::CreateFrom1xBitmap(*icon));
+      }
+      DestroyIcon(icon_info.hIcon);
+    }
+  }
+#endif
+}
+
 }  // namespace
 
 // OutdatedUpgradeBubbleView ---------------------------------------------------
 
 OutdatedUpgradeBubbleView* OutdatedUpgradeBubbleView::upgrade_bubble_ = NULL;
 int OutdatedUpgradeBubbleView::num_ignored_bubbles_ = 0;
 
 // static
 void OutdatedUpgradeBubbleView::ShowBubble(views::View* anchor_view,
-                                           content::PageNavigator* navigator) {
+                                           content::PageNavigator* navigator,
+                                           bool auto_update_enabled) {
   if (IsShowing())
     return;
-  upgrade_bubble_ = new OutdatedUpgradeBubbleView(anchor_view, navigator);
+  upgrade_bubble_ = new OutdatedUpgradeBubbleView(
+      anchor_view, navigator, auto_update_enabled);
   views::BubbleDelegateView::CreateBubble(upgrade_bubble_)->Show();
-  content::RecordAction(
-      base::UserMetricsAction("OutdatedUpgradeBubble.Show"));
+  content::RecordAction(base::UserMetricsAction(
+      auto_update_enabled ? "OutdatedUpgradeBubble.Show"
+                          : "OutdatedUpgradeBubble.ShowNoAU"));
 }
 
 bool OutdatedUpgradeBubbleView::IsAvailable() {
 // This should only work on non-Chrome OS desktop platforms.
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   return true;
 #else
   return false;
 #endif
 }
 
 OutdatedUpgradeBubbleView::~OutdatedUpgradeBubbleView() {
-  if (!chose_to_reinstall_ && num_ignored_bubbles_ < kMaxIgnored)
+  if (!accepted_ && num_ignored_bubbles_ < kMaxIgnored)
     ++num_ignored_bubbles_;
 }
 
 views::View* OutdatedUpgradeBubbleView::GetInitiallyFocusedView() {
-  return reinstall_button_;
+  return accept_button_;
 }
 
 void OutdatedUpgradeBubbleView::WindowClosing() {
   // Reset |upgrade_bubble_| here, not in destructor, because destruction is
   // asynchronous and ShowBubble may be called before full destruction and
   // would attempt to show a bubble that is closing.
   DCHECK_EQ(upgrade_bubble_, this);
   upgrade_bubble_ = NULL;
 }
 
 void OutdatedUpgradeBubbleView::Init() {
-  base::string16 product_name(
-      l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  reinstall_button_ = new views::LabelButton(
-      this, l10n_util::GetStringFUTF16(IDS_REINSTALL_APP, product_name));
-  reinstall_button_->SetStyle(views::Button::STYLE_BUTTON);
-  reinstall_button_->SetIsDefault(true);
-  reinstall_button_->SetFontList(rb.GetFontList(ui::ResourceBundle::BoldFont));
+  accept_button_ = new views::LabelButton(
+      this, l10n_util::GetStringUTF16(
+          auto_update_enabled_ ? IDS_REINSTALL_APP : IDS_REENABLE_UPDATES));
+  accept_button_->SetStyle(views::Button::STYLE_BUTTON);
+  accept_button_->SetIsDefault(true);
+  accept_button_->SetFontList(rb.GetFontList(ui::ResourceBundle::BoldFont));
+  AddElevationIconIfNeeded(accept_button_);
 
   later_button_ = new views::LabelButton(
       this, l10n_util::GetStringUTF16(IDS_LATER));
   later_button_->SetStyle(views::Button::STYLE_BUTTON);
 
   views::Label* title_label = new views::Label(
-      l10n_util::GetStringFUTF16(IDS_UPGRADE_BUBBLE_TITLE, product_name));
+      l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_TITLE));
   title_label->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
-  views::Label* text_label = new views::Label(
-      l10n_util::GetStringFUTF16(IDS_UPGRADE_BUBBLE_TEXT, product_name));
+  views::Label* text_label = new views::Label(l10n_util::GetStringUTF16(
+      auto_update_enabled_ ? IDS_UPGRADE_BUBBLE_TEXT
+                           : IDS_UPGRADE_BUBBLE_REENABLE_TEXT));
   text_label->SetMultiLine(true);
   text_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   views::ImageView* image_view = new views::ImageView();
   image_view->SetImage(rb.GetImageSkiaNamed(IDR_UPDATE_MENU_SEVERITY_HIGH));
 
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
   const int kIconTitleColumnSetId = 0;
@@ skipping 27 matching lines @@
   layout->AddView(image_view);
   layout->AddView(title_label);
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, kTextColumnSetId);
   layout->AddView(text_label);
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, kButtonsColumnSetId);
-  layout->AddView(reinstall_button_);
+  layout->AddView(accept_button_);
   layout->AddView(later_button_);
 
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
 }
 
 OutdatedUpgradeBubbleView::OutdatedUpgradeBubbleView(
-    views::View* anchor_view, content::PageNavigator* navigator)
+    views::View* anchor_view,
+    content::PageNavigator* navigator,
+    bool auto_update_enabled)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
-      chose_to_reinstall_(false),
-      reinstall_button_(NULL),
+      auto_update_enabled_(auto_update_enabled),
+      accepted_(false),
+      accept_button_(NULL),
       later_button_(NULL),
       navigator_(navigator) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
 }
 
 void OutdatedUpgradeBubbleView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   if (event.IsMouseEvent() &&
       !(static_cast<const ui::MouseEvent*>(&event))->IsOnlyLeftMouseButton()) {
     return;
   }
   HandleButtonPressed(sender);
 }
 
 void OutdatedUpgradeBubbleView::HandleButtonPressed(views::Button* sender) {
-  if (sender == reinstall_button_) {
-    DCHECK(UpgradeDetector::GetInstance()->is_outdated_install());
-    chose_to_reinstall_ = true;
-    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 (sender == accept_button_) {
+    accepted_ = true;
+    if (auto_update_enabled_) {
+      DCHECK(UpgradeDetector::GetInstance()->is_outdated_install());
+      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));
+    } 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, and record enable_au bit to local state.

[robertshield, 2014/03/26 20:37:18]

Actually since you've added the pref, you could set it here if you like :-)

[MAD, 2014/03/26 21:21:10]

Actually, I thought it would be better if we added within the function... I'm a
bit ambivalent here... And shouldn't we only set it when the API returned true?
Then I would prefer we wait for the API to be called here...

[robertshield, 2014/03/26 21:45:09]

I think we should set it regardless of whether the API succeeds or not. It does
no harm if the API succeeds and this way we don't have to worry about it not
being set for reasons in cases where the API might fail (picture e.g. a call out
to setup.exe and setup.exe hangs forever).

+    }
   } else {
     DCHECK_EQ(later_button_, sender);
     content::RecordAction(
         base::UserMetricsAction("OutdatedUpgradeBubble.Later"));
   }
   GetWidget()->Close();
 }