Closing unused new tabs for ARC

chrome/browser/ui/views/intent_picker_bubble_view.cc

 // Copyright 2016 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/intent_picker_bubble_view.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 218 matching lines @@
       app_info_(app_info) {}
 
 IntentPickerBubbleView::~IntentPickerBubbleView() {
   SetLayoutManager(nullptr);
 }
 
 // If the widget gets closed without an app being selected we still need to use
 // the callback so the caller can Resume the navigation.
 void IntentPickerBubbleView::OnWidgetDestroying(views::Widget* widget) {
   if (!was_callback_run_) {
+    was_callback_run_ = true;
     throttle_cb_.Run(
         kAppTagNoneSelected,
         arc::ArcNavigationThrottle::CloseReason::DIALOG_DEACTIVATED);
-    was_callback_run_ = true;
   }
 }
 
 int IntentPickerBubbleView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 void IntentPickerBubbleView::ButtonPressed(views::Button* sender,
                                            const ui::Event& event) {
   switch (sender->tag()) {
     case static_cast<int>(Option::ALWAYS):
+      was_callback_run_ = true;
       throttle_cb_.Run(selected_app_tag_,
                        arc::ArcNavigationThrottle::CloseReason::ALWAYS_PRESSED);
-      was_callback_run_ = true;
       GetWidget()->Close();
       break;
     case static_cast<int>(Option::JUST_ONCE):
+      was_callback_run_ = true;
       throttle_cb_.Run(
           selected_app_tag_,
           arc::ArcNavigationThrottle::CloseReason::JUST_ONCE_PRESSED);
-      was_callback_run_ = true;
       GetWidget()->Close();
       break;
     default:
       // The selected app must be a value in the range [0, app_info_.size()-1].
       DCHECK(static_cast<size_t>(sender->tag()) < app_info_.size());
       // The user cannot click on the |always_button_| or |just_once_button_|
       // unless an explicit app has been selected.
       if (selected_app_tag_ != kAppTagNoneSelected)
         SetLabelButtonBackgroundColor(selected_app_tag_, SK_ColorWHITE);
       selected_app_tag_ = sender->tag();
@@ skipping 16 matching lines @@
     apps_height *= kRowHeight;
   }
   ps.set_height(apps_height + kHeaderHeight + kFooterHeight);
   return ps;
 }
 
 // If the actual web_contents gets destroyed in the middle of the process we
 // should inform the caller about this error.
 void IntentPickerBubbleView::WebContentsDestroyed() {
   if (!was_callback_run_) {
+    was_callback_run_ = true;
     throttle_cb_.Run(kAppTagNoneSelected,
                      arc::ArcNavigationThrottle::CloseReason::ERROR);
-    was_callback_run_ = true;
   }
   GetWidget()->Close();
 }
 
 views::LabelButton* IntentPickerBubbleView::GetLabelButtonAt(size_t index) {
   views::View* temp_contents = scroll_view_->contents();
   return static_cast<views::LabelButton*>(temp_contents->child_at(index));
 }
 
 void IntentPickerBubbleView::SetLabelButtonBackgroundColor(size_t index,
                                                            SkColor color) {
   views::LabelButton* temp_lb = GetLabelButtonAt(index);
   temp_lb->set_background(views::Background::CreateSolidBackground(color));
   temp_lb->SchedulePaint();
 }