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

chrome/browser/cocoa/content_exceptions_window_controller.mm

Index: chrome/browser/cocoa/content_exceptions_window_controller.mm
===================================================================
--- chrome/browser/cocoa/content_exceptions_window_controller.mm	(revision 59533)
+++ chrome/browser/cocoa/content_exceptions_window_controller.mm	(working copy)
@@ -135,13 +135,6 @@
                                             CONTENT_SETTING_SESSION_ONLY,
                                             CONTENT_SETTING_BLOCK };
 
-// The settings shown in the combobox if show_session_ is true, and we still
-// offer the cookie prompt mode.
-const ContentSetting kSessionAskSettings[] = { CONTENT_SETTING_ALLOW,
-                                               CONTENT_SETTING_ASK,
-                                               CONTENT_SETTING_SESSION_ONLY,
-                                               CONTENT_SETTING_BLOCK };
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -178,8 +171,6 @@
     model_.reset(new ContentExceptionsTableModel(
         settingsMap_, otrSettingsMap_, settingsType_));
     showSession_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
-    disableCookiePrompt_ = !CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableCookiePrompt);
     otrAllowed_ = otrSettingsMap != NULL;
     tableObserver_.reset(new UpdatingContentSettingsObserver(self));
     updatesEnabled_ = YES;
@@ -505,12 +496,8 @@
 }
 
 - (size_t)menuItemCount {
-  if (showSession_) {
-    return disableCookiePrompt_ ?
-        arraysize(kSessionSettings) : arraysize(kSessionAskSettings);
-  } else {
-    return arraysize(kNoSessionSettings);
-  }
+  return showSession_ ? arraysize(kSessionSettings)
+                      : arraysize(kNoSessionSettings);
 }
 
 - (NSString*)titleForIndex:(size_t)index {
@@ -519,8 +506,6 @@
       return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_ALLOW_BUTTON);
     case CONTENT_SETTING_BLOCK:
       return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_BLOCK_BUTTON);
-    case CONTENT_SETTING_ASK:
-      return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_ASK_BUTTON);
     case CONTENT_SETTING_SESSION_ONLY:
       return l10n_util::GetNSStringWithFixup(
           IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
@@ -531,12 +516,7 @@
 }
 
 - (ContentSetting)settingForIndex:(size_t)index {
-  if (showSession_) {
-    return disableCookiePrompt_ ?
-        kSessionSettings[index] : kSessionAskSettings[index];
-  } else {
-    return kNoSessionSettings[index];
-  }
+  return showSession_ ? kSessionSettings[index] : kNoSessionSettings[index];
 }
 
 - (size_t)indexForSetting:(ContentSetting)setting {