Hide protocol handler icon in location bar after user is done

chrome/browser/ui/content_settings/content_setting_bubble_model.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/content_settings/content_setting_bubble_model.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 208 matching lines @@
 
   ContentSetting block_setting_;
   int selected_item_;
 };
 
 ContentSettingSingleRadioGroup::ContentSettingSingleRadioGroup(
     Delegate* delegate,
     WebContents* web_contents,
     Profile* profile,
     ContentSettingsType content_type)
-    : ContentSettingSimpleBubbleModel(delegate, web_contents, profile,
+    : ContentSettingSimpleBubbleModel(delegate,
+                                      web_contents,
+                                      profile,
                                       content_type),
       block_setting_(CONTENT_SETTING_BLOCK),
       selected_item_(0) {
   SetRadioGroup();
 }
 
 ContentSettingSingleRadioGroup::~ContentSettingSingleRadioGroup() {
   if (settings_changed()) {
     ContentSetting setting =
         selected_item_ == kAllowButtonIndex ?
@@ skipping 760 matching lines @@
 ContentSettingRPHBubbleModel::ContentSettingRPHBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
     Profile* profile,
     ProtocolHandlerRegistry* registry)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
                                       profile,
                                       CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS),
       selected_item_(0),
+      interacted_(false),
       registry_(registry),
       pending_handler_(ProtocolHandler::EmptyProtocolHandler()),
       previous_handler_(ProtocolHandler::EmptyProtocolHandler()) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   pending_handler_ = content_settings->pending_protocol_handler();
   previous_handler_ = content_settings->previous_protocol_handler();
 
   base::string16 protocol;
   if (pending_handler_.protocol() == "mailto") {
@@ skipping 41 matching lines @@
   else if (setting == CONTENT_SETTING_BLOCK)
     radio_group.default_item = RPH_BLOCK;
   else
     radio_group.default_item = RPH_IGNORE;
 
   selected_item_ = radio_group.default_item;
   set_radio_group_enabled(true);
   set_radio_group(radio_group);
 }
 
+ContentSettingRPHBubbleModel::~ContentSettingRPHBubbleModel() {
+  if (!web_contents() || !interacted_)
+    return;
+
+  // The user has one chance to deal with the RPH content setting UI,
+  // then we remove it.
+  TabSpecificContentSettings::FromWebContents(web_contents())->
+      ClearPendingProtocolHandler();
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
+      content::Source<WebContents>(web_contents()),
+      content::NotificationService::NoDetails());
+}
+
 void ContentSettingRPHBubbleModel::OnRadioClicked(int radio_index) {
   if (selected_item_ == radio_index)
     return;
 
+  interacted_ = true;
   selected_item_ = radio_index;
 
   if (radio_index == RPH_ALLOW)
     RegisterProtocolHandler();
   else if (radio_index == RPH_BLOCK)
     UnregisterProtocolHandler();
   else if (radio_index == RPH_IGNORE)
     IgnoreProtocolHandler();
   else
     NOTREACHED();
 }
 
 void ContentSettingRPHBubbleModel::OnDoneClicked() {
-  if (!web_contents())
-    return;
-
-  // The user has one chance to deal with the RPH content setting UI,
-  // then we remove it.
-  TabSpecificContentSettings::FromWebContents(web_contents())->
-      ClearPendingProtocolHandler();
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
-      content::Source<WebContents>(web_contents()),
-      content::NotificationService::NoDetails());
+  interacted_ = true;
 }
 
 void ContentSettingRPHBubbleModel::RegisterProtocolHandler() {
   if (!web_contents())
     return;
 
   // A no-op if the handler hasn't been ignored, but needed in case the user
   // selects sequences like register/ignore/register.
   registry_->RemoveIgnoredHandler(pending_handler_);
 
@@ skipping 222 matching lines @@
     ContentSettingBubbleModel::AsSimpleBubbleModel() {
   // In general, bubble models might not inherit from the simple bubble model.
   return nullptr;
 }
 
 ContentSettingMediaStreamBubbleModel*
     ContentSettingBubbleModel::AsMediaStreamBubbleModel() {
   // In general, bubble models might not inherit from the media bubble model.
   return nullptr;
 }