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

chrome/browser/cocoa/content_settings_dialog_controller.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_settings_dialog_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 108 matching lines @@
   // TODO(thakis): Autosave window pos.
 
   [g_instance selectTab:settingsType];
   [g_instance showWindow:nil];
   [g_instance closeExceptionsSheet];
   return g_instance;
 }
 
 - (id)initWithProfile:(Profile*)profile {
   DCHECK(profile);
-  disableCookiePrompt_ = !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableCookiePrompt);
   NSString* nibpath =
       [mac_util::MainAppBundle() pathForResource:@"ContentSettings"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
 
     observer_.reset(
         new ContentSettingsDialogControllerInternal::PrefObserverBridge(self));
     clearSiteDataOnExit_.Init(prefs::kClearSiteDataOnExit,
                               profile_->GetPrefs(), observer_.get());
@@ skipping 34 matching lines @@
     [NSApp endSheet:attachedSheet];
   }
 }
 
 - (void)awakeFromNib {
   DCHECK([self window]);
   DCHECK(tabView_);
   DCHECK(tabViewPicker_);
   DCHECK_EQ(self, [[self window] delegate]);
 
-  [tabView_ removeTabViewItem:[tabView_
-      tabViewItemAtIndex:disableCookiePrompt_ ? 0 : 1]];
-
   // Adapt views to potentially long localized strings.
   CGFloat windowDelta = 0;
   for (NSTabViewItem* tab in [tabView_ tabViewItems]) {
     NSArray* subviews = [[tab view] subviews];
     windowDelta = MAX(windowDelta,
                       cocoa_l10n_util::VerticallyReflowGroup(subviews));
 
     for (NSView* view in subviews) {
       // Since the tab pane is in a horizontal resizer in IB, it's convenient
       // to give all the subviews flexible width so that their sizes are
@@ skipping 38 matching lines @@
     lastSelectedTab_.SetValue(index);
 }
 
 // Let esc close the window.
 - (void)cancel:(id)sender {
   [self close];
 }
 
 - (void)setCookieSettingIndex:(NSInteger)value {
   ContentSetting setting = CONTENT_SETTING_DEFAULT;
-  // If the cookie prompt is disabled, the radio button for "block" is at the
-  // position of the "ask" radio in the old dialog.
-  if (disableCookiePrompt_ && value == kCookieAskIndex)
-    value = kCookieDisabledIndex;
   switch (value) {
     case kCookieEnabledIndex:  setting = CONTENT_SETTING_ALLOW; break;
-    case kCookieAskIndex:      setting = CONTENT_SETTING_ASK; break;
     case kCookieDisabledIndex: setting = CONTENT_SETTING_BLOCK; break;
     default:
       NOTREACHED();
   }
   ContentSettingsDialogControllerInternal::PrefObserverDisabler
       disabler(observer_.get());
   profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_COOKIES,
       setting);
 }
 
 - (NSInteger)cookieSettingIndex {
   switch (profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_COOKIES)) {
     case CONTENT_SETTING_ALLOW:        return kCookieEnabledIndex;
-    case CONTENT_SETTING_ASK:          return kCookieAskIndex;
-    // If the cookie prompt is disabled, the radio button for "block" is at the
-    // position of the "ask" radio in the old dialog.
-    case CONTENT_SETTING_BLOCK:        return disableCookiePrompt_ ?
-                                           kCookieAskIndex :
-                                           kCookieDisabledIndex;
+    case CONTENT_SETTING_BLOCK:        return kCookieDisabledIndex;
     default:
       NOTREACHED();
       return kCookieEnabledIndex;
   }
 }
 
 - (BOOL)blockThirdPartyCookies {
   HostContentSettingsMap* settingsMap = profile_->GetHostContentSettingsMap();
   return settingsMap->BlockThirdPartyCookies();
 }
@@ skipping 291 matching lines @@
     [self willChangeValueForKey:@"geolocationSettingIndex"];
     [self didChangeValueForKey:@"geolocationSettingIndex"];
   }
   if (*prefName == prefs::kDesktopNotificationDefaultContentSetting) {
     [self willChangeValueForKey:@"notificationsSettingIndex"];
     [self didChangeValueForKey:@"notificationsSettingIndex"];
   }
 }
 
 @end