Remove vestigial cookie/web app permissions prompting UI now that the async U...

chrome/browser/cocoa/content_setting_bubble_cocoa.mm

 // Copyright (c) 2010 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/cocoa/content_setting_bubble_cocoa.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
@@ skipping 418 matching lines @@
 
   // Resize window, autoresizing takes care of the rest.
   NSSize size = NSMakeSize(requiredWidth - actualWidth, 0);
   size = [[[self window] contentView] convertSize:size toView:nil];
   NSRect frame = [[self window] frame];
   frame.origin.x -= size.width;
   frame.size.width += size.width;
   [[self window] setFrame:frame display:NO];
 }
 
-- (void)removeInfoButton {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableCookiePrompt)) {
-    // Remove info button and resize vertically.
-    int deltaY = NSHeight([infoButton_ frame]);
-    [infoButton_ removeFromSuperview];
-    NSRect frame = [[self window] frame];
-    frame.size.height -= deltaY;
-    [[self window] setFrame:frame display:NO];
-  }
-}
-
 - (void)awakeFromNib {
   [[self bubble] setBubbleType:info_bubble::kWhiteInfoBubble];
   [[self bubble] setArrowLocation:info_bubble::kTopRight];
 
   // 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 sizeToFitLoadPluginsButton];
     [self initializeBlockedPluginsList];
   }
-  if (type == CONTENT_SETTINGS_TYPE_COOKIES)
-    [self removeInfoButton];
   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];
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 28 matching lines @@
   DCHECK(i != popupLinks_.end());
   contentSettingBubbleModel_->OnPopupClicked(i->second);
 }
 
 - (void)clearGeolocationForCurrentHost:(id)sender {
   contentSettingBubbleModel_->OnClearLinkClicked();
   [self close];
 }
 
 @end  // ContentSettingBubbleController