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 372 matching lines @@
     dialog_size_ = gfx::Size(
         dialog_width, std::min(header_only_size.height(), kDialogMaxHeight));
   }
 
   std::string event_name = ExperienceSamplingEvent::kExtensionInstallDialog;
   event_name.append(
       ExtensionInstallPrompt::PromptTypeToString(prompt_->type()));
   sampling_event_ = ExperienceSamplingEvent::Create(event_name);
 }
 
-ExtensionInstallDialogView::~ExtensionInstallDialogView() {}
+ExtensionInstallDialogView::~ExtensionInstallDialogView() {
+  if (!handled_result_)
+    delegate_->InstallUIAbort(true);
+}
 
 views::GridLayout* ExtensionInstallDialogView::CreateLayout(
     views::View* parent,
     int left_column_width,
     int column_set_id,
     bool single_detail_row) const {
   views::GridLayout* layout = views::GridLayout::CreatePanel(parent);
   parent->SetLayoutManager(layout);
 
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
@@ skipping 105 matching lines @@
       NOTREACHED();
       return base::string16();
   }
 }
 
 int ExtensionInstallDialogView::GetDefaultDialogButton() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
 
 bool ExtensionInstallDialogView::Cancel() {
+  if (handled_result_)
+    return true;
+
+  handled_result_ = true;
   UpdateInstallResultHistogram(false);
-  if (sampling_event_.get())
+  if (sampling_event_)
     sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
   delegate_->InstallUIAbort(true);
   return true;
 }
 
 bool ExtensionInstallDialogView::Accept() {
+  DCHECK(!handled_result_);
+
+  handled_result_ = true;
   UpdateInstallResultHistogram(true);
-  if (sampling_event_.get())
+  if (sampling_event_)
     sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kProceed);
   delegate_->InstallUIProceed();
   return true;
 }
 
 ui::ModalType ExtensionInstallDialogView::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 base::string16 ExtensionInstallDialogView::GetWindowTitle() const {
@@ skipping 330 matching lines @@
 void ExpandableContainerView::ExpandWithoutAnimation() {
   expanded_ = true;
   details_view_->AnimateToState(1.0);
 }
 
 // static
 ExtensionInstallPrompt::ShowDialogCallback
 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
   return base::Bind(&ShowExtensionInstallDialogImpl);
 }