Hide protocol handler icon in location bar after user is done

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 144 matching lines @@
 ContentSettingBubbleContents::ContentSettingBubbleContents(
     ContentSettingBubbleModel* content_setting_bubble_model,
     content::WebContents* web_contents,
     views::View* anchor_view,
     views::BubbleBorder::Arrow arrow)
     : content::WebContentsObserver(web_contents),
       BubbleDialogDelegateView(anchor_view, arrow),
       content_setting_bubble_model_(content_setting_bubble_model),
       custom_link_(NULL),
       manage_link_(NULL),
-      learn_more_link_(NULL),
-      close_button_(NULL) {
+      learn_more_link_(NULL) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 }
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {
   // Must remove the children here so the comboboxes get destroyed before
   // their associated models.
   RemoveAllChildViews(true);
 }
@@ skipping 196 matching lines @@
   }
 }
 
 views::View* ContentSettingBubbleContents::CreateExtraView() {
   manage_link_ = new views::Link(base::UTF8ToUTF16(
       content_setting_bubble_model_->bubble_content().manage_link));
   manage_link_->set_listener(this);
   return manage_link_;
 }
 
+bool ContentSettingBubbleContents::Accept() {
+  content_setting_bubble_model_->OnDoneClicked();
+  return true;
+}
+
+bool ContentSettingBubbleContents::Close() {
+  return true;
+}
+
 int ContentSettingBubbleContents::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK;
 }
 
 base::string16 ContentSettingBubbleContents::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(IDS_DONE);
 }
 
 void ContentSettingBubbleContents::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Content settings are based on the main frame, so if it switches then
   // close up shop.
-  content_setting_bubble_model_->OnDoneClicked();
   GetWidget()->Close();
 }
 
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
   RadioGroup::const_iterator i(
       std::find(radio_group_.begin(), radio_group_.end(), sender));
-  if (i != radio_group_.end()) {
-    content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
-    return;
-  }
-  DCHECK_EQ(sender, close_button_);
-  content_setting_bubble_model_->OnDoneClicked();
-  GetWidget()->Close();
+  DCHECK(i != radio_group_.end());

[msw, 2016/07/20 20:50:16]

nit: DCHECK_NE?

[Evan Stade, 2016/07/20 20:56:46]

DCHECK_NE seems more useful when you have two variables of unknown value.
radio_group_.end() is not a unknown, hence if this DCHECK fails you know what i
is (and what the problem is).

+  content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
 }
 
 void ContentSettingBubbleContents::LinkClicked(views::Link* source,
                                                int event_flags) {
   if (source == learn_more_link_) {
     content_setting_bubble_model_->OnLearnMoreLinkClicked();
     GetWidget()->Close();
     return;
   }
   if (source == custom_link_) {
@@ skipping 13 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }