Revert 147045 - Bring up a content settings icon for ungestured registerProtocolHandler call.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "content/public/browser/plugin_service.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::PluginService;
 
 namespace {
 
+// Must match the tag of the unblock radio button in the xib files.
+const int kAllowTag = 1;
+
+// Must match the tag of the block radio button in the xib files.
+const int kBlockTag = 2;
+
 // Height of one link in the popup list.
 const int kLinkHeight = 16;
 
 // Space between two popup links.
 const int kLinkPadding = 4;
 
 // Space taken in total by one popup link.
 const int kLinkLineHeight = kLinkHeight + kLinkPadding;
 
 // Space between popup list and surrounding UI elements.
@@ skipping 88 matching lines @@
     case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
       nibPath = @"ContentBlockedJavaScript"; break;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       nibPath = @"ContentBlockedPlugins"; break;
     case CONTENT_SETTINGS_TYPE_POPUPS:
       nibPath = @"ContentBlockedPopups"; break;
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       nibPath = @"ContentBlockedGeolocation"; break;
     case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
       nibPath = @"ContentBlockedMixedScript"; break;
-    case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
-      nibPath = @"ContentProtocolHandlers"; break;
     default:
       NOTREACHED();
   }
   if ((self = [super initWithWindowNibPath:nibPath
                               parentWindow:parentWindow
                                 anchoredAt:anchoredAt])) {
     contentSettingBubbleModel_.reset(model.release());
     [self showWindow:nil];
   }
   return self;
@@ skipping 12 matching lines @@
       sizeToFitFixedWidthTextField:titleLabel_];
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += deltaY;
   [[self window] setFrame:windowFrame display:NO];
   NSRect titleFrame = [titleLabel_ frame];
   titleFrame.origin.y -= deltaY;
   [titleLabel_ setFrame:titleFrame];
 }
 
 - (void)initializeRadioGroup {
-  // NOTE! Tags in the xib files must match the order of the radio buttons
-  // passed in the radio_group and be 1-based, not 0-based.
+  // Configure the radio group. For now, only deal with the
+  // strictly needed case of group containing 2 radio buttons.
   const ContentSettingBubbleModel::RadioGroup& radio_group =
       contentSettingBubbleModel_->bubble_content().radio_group;
 
   // Select appropriate radio button.
-  [allowBlockRadioGroup_ selectCellWithTag: radio_group.default_item + 1];
+  [allowBlockRadioGroup_ selectCellWithTag:
+      radio_group.default_item == 0 ? kAllowTag : kBlockTag];
 
   const ContentSettingBubbleModel::RadioItems& radio_items =
       radio_group.radio_items;
-  for (size_t ii = 0; ii < radio_group.radio_items.size(); ++ii) {
-    NSCell* radioCell = [allowBlockRadioGroup_ cellWithTag: ii + 1];
-    [radioCell setTitle:base::SysUTF8ToNSString(radio_items[ii])];
-  }
+  DCHECK_EQ(2u, radio_items.size()) << "Only 2 radio items per group supported";
+  // Set radio group labels from model.
+  NSCell* radioCell = [allowBlockRadioGroup_ cellWithTag:kAllowTag];
+  [radioCell setTitle:base::SysUTF8ToNSString(radio_items[0])];
+
+  radioCell = [allowBlockRadioGroup_ cellWithTag:kBlockTag];
+  [radioCell setTitle:base::SysUTF8ToNSString(radio_items[1])];
 
   // Layout radio group labels post-localization.
   [GTMUILocalizerAndLayoutTweaker
       wrapRadioGroupForWidth:allowBlockRadioGroup_];
   CGFloat radioDeltaY = [GTMUILocalizerAndLayoutTweaker
       sizeToFitView:allowBlockRadioGroup_].height;
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += radioDeltaY;
   [[self window] setFrame:windowFrame display:NO];
 }
@@ skipping 239 matching lines @@
   // Adapt window size to bottom buttons. Do this before all other layouting.
   [self sizeToFitManageDoneButtons];
 
   [self initializeTitle];
 
   ContentSettingsType type = contentSettingBubbleModel_->content_type();
   if (type == CONTENT_SETTINGS_TYPE_PLUGINS) {
     [self sizeToFitLoadButton];
     [self initializeBlockedPluginsList];
   }
-
   if (allowBlockRadioGroup_)  // not bound in cookie bubble xib
     [self initializeRadioGroup];
 
   if (type == CONTENT_SETTINGS_TYPE_POPUPS)
     [self initializePopupList];
   if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
     [self initializeGeoLists];
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Actual application logic
 
 - (IBAction)allowBlockToggled:(id)sender {
   NSButtonCell *selectedCell = [sender selectedCell];
-  contentSettingBubbleModel_->OnRadioClicked([selectedCell tag] - 1);
+  contentSettingBubbleModel_->OnRadioClicked(
+      [selectedCell tag] == kAllowTag ? 0 : 1);
 }
 
 - (void)popupLinkClicked:(id)sender {
   content_setting_bubble::PopupLinks::iterator i(popupLinks_.find(sender));
   DCHECK(i != popupLinks_.end());
   contentSettingBubbleModel_->OnPopupClicked(i->second);
 }
 
 - (void)clearGeolocationForCurrentHost:(id)sender {
   contentSettingBubbleModel_->OnCustomLinkClicked();
@@ skipping 16 matching lines @@
 
 - (IBAction)manageBlocking:(id)sender {
   contentSettingBubbleModel_->OnManageLinkClicked();
 }
 
 - (IBAction)closeBubble:(id)sender {
   [self close];
 }
 
 @end  // ContentSettingBubbleController