Ensure app install is aborted when the install dialog is closed

chrome/browser/ui/views/extensions/extension_install_dialog_view.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/browser/ui/views/extensions/extension_install_dialog_view.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 177 matching lines @@
     ExtensionInstallPrompt::Delegate* delegate,
     scoped_refptr<ExtensionInstallPrompt::Prompt> prompt)
     : navigator_(navigator),
       delegate_(delegate),
       prompt_(prompt),
       scroll_view_(NULL),
       scrollable_(NULL),
       scrollable_header_only_(NULL),
       show_details_link_(NULL),
       checkbox_info_label_(NULL),
-      unchecked_boxes_(0) {
+      unchecked_boxes_(0),
+      handled_result_(false) {
   // Possible grid layouts without ExtensionPermissionDialog experiment:
   // Inline install
   //      w/ permissions                 no permissions
   // +--------------------+------+  +--------------+------+
   // | heading            | icon |  | heading      | icon |
   // +--------------------|      |  +--------------|      |
   // | rating             |      |  | rating       |      |
   // +--------------------|      |  +--------------+      |
   // | user_count         |      |  | user_count   |      |
   // +--------------------|      |  +--------------|      |
@@ skipping 498 matching lines @@
       NOTREACHED();
       return base::string16();
   }
 }
 
 int ExtensionInstallDialogView::GetDefaultDialogButton() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
 
 bool ExtensionInstallDialogView::Cancel() {
-  UpdateInstallResultHistogram(false);
-  if (sampling_event_.get())
-    sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
-  delegate_->InstallUIAbort(true);
+  OnInstallAborted();
   return true;
 }
 
 bool ExtensionInstallDialogView::Accept() {
+  DCHECK(!handled_result_);
+
+  handled_result_ = true;
   UpdateInstallResultHistogram(true);
   if (sampling_event_.get())
     sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kProceed);
   delegate_->InstallUIProceed();
   return true;
 }
 
+void ExtensionInstallDialogView::OnClosed() {
+  // The install dialog may have been closed without the user selecting accept
+  // or cancel, so ensure this case is treated as an abort.
+  OnInstallAborted();
+}
+
 ui::ModalType ExtensionInstallDialogView::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 base::string16 ExtensionInstallDialogView::GetWindowTitle() const {
   return prompt_->GetDialogTitle();
 }
 
 void ExtensionInstallDialogView::LinkClicked(views::Link* source,
                                              int event_flags) {
@@ skipping 106 matching lines @@
         NUM_LINK_ACTIONS);
   } else {
     // The clickable link in the UI is "Show Details".
     UMA_HISTOGRAM_ENUMERATION(
         "Extensions.InstallPromptExperiment.ShowDetails",
         action_type,
         NUM_LINK_ACTIONS);
   }
 }
 
+void ExtensionInstallDialogView::OnInstallAborted() {
+  if (handled_result_)
+    return;
+
+  handled_result_ = true;
+  UpdateInstallResultHistogram(false);
+  if (sampling_event_.get())

[tapted, 2014/09/08 07:42:20]

nit: pretty sure Chrome prefers dropping the `.get()` (I guess
ExperienceSamplingEvent suggests .get(), but probably just because it's easier
to describe in a comment)

[tmdiep, 2014/09/08 08:26:08]

Done.

+    sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
+  delegate_->InstallUIAbort(true);
+}
+
 // ExpandableContainerView::DetailsView ----------------------------------------
 
 ExpandableContainerView::DetailsView::DetailsView(int horizontal_space,
                                                   bool parent_bulleted,
                                                   bool lighter_color)
     : layout_(new views::GridLayout(this)),
       state_(0),
       lighter_color_(lighter_color) {
   SetLayoutManager(layout_);
   views::ColumnSet* column_set = layout_->AddColumnSet(0);
@@ skipping 199 matching lines @@
 void ExpandableContainerView::ExpandWithoutAnimation() {
   expanded_ = true;
   details_view_->AnimateToState(1.0);
 }
 
 // static
 ExtensionInstallPrompt::ShowDialogCallback
 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
   return base::Bind(&ShowExtensionInstallDialogImpl);
 }