Remove the cookie prompt from the settings UI and migrate prefs from ask to block.

chrome/browser/cocoa/content_exceptions_window_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_exceptions_window_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/table_model_observer.h"
 #import "base/mac_util.h"
 #import "base/scoped_nsobject.h"
@@ skipping 105 matching lines @@
     case CONTENT_SETTINGS_TYPE_POPUPS:
       return l10n_util::GetNSStringWithFixup(IDS_POPUP_EXCEPTION_TITLE);
     default:
       NOTREACHED();
   }
   return @"";
 }
 
 const CGFloat kButtonBarHeight = 35.0;
 
-// The settings shown in the combobox if showAsk_ is false;
-const ContentSetting kNoAskSettings[] = { CONTENT_SETTING_ALLOW,
-                                          CONTENT_SETTING_BLOCK };
+// The settings shown in the combobox if showSession_ is false;
+const ContentSetting kNoSessionSettings[] = { CONTENT_SETTING_ALLOW,
+                                              CONTENT_SETTING_BLOCK };
 
-// The settings shown in the combobox if showAsk_ is true;
-const ContentSetting kAskSettings[] = { CONTENT_SETTING_ALLOW,
-                                        CONTENT_SETTING_ASK,
-                                        CONTENT_SETTING_SESSION_ONLY,
-                                        CONTENT_SETTING_BLOCK };
+// The settings shown in the combobox if showSession_ is true;
+const ContentSetting kSessionSettings[] = { CONTENT_SETTING_ALLOW,
+                                            CONTENT_SETTING_SESSION_ONLY,
+                                            CONTENT_SETTING_BLOCK };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ContentExceptionsWindowController implementation
 
 static ContentExceptionsWindowController*
     g_exceptionWindows[CONTENT_SETTINGS_NUM_TYPES] = { nil };
 
 @implementation ContentExceptionsWindowController
@@ skipping 16 matching lines @@
     otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap {
   NSString* nibpath =
       [mac_util::MainAppBundle() pathForResource:@"ContentExceptionsWindow"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     settingsType_ = settingsType;
     settingsMap_ = settingsMap;
     otrSettingsMap_ = otrSettingsMap;
     model_.reset(new ContentExceptionsTableModel(
         settingsMap_, otrSettingsMap_, settingsType_));
-    showAsk_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
+    showSession_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
     otrAllowed_ = otrSettingsMap != NULL;
     tableObserver_.reset(new UpdatingContentSettingsObserver(self));
     updatesEnabled_ = YES;
 
     // TODO(thakis): autoremember window rect.
     // TODO(thakis): sorting support.
   }
   return self;
 }
 
@@ skipping 305 matching lines @@
 
   // The model caches its data, meaning we need to recreate it on every change.
   model_.reset(new ContentExceptionsTableModel(
       settingsMap_, otrSettingsMap_, settingsType_));
 
   [tableView_ reloadData];
   [self adjustEditingButtons];
 }
 
 - (size_t)menuItemCount {
-  return showAsk_ ? arraysize(kAskSettings) : arraysize(kNoAskSettings);
+  return showSession_ ?
+      arraysize(kSessionSettings) : arraysize(kNoSessionSettings);
 }
 
 - (NSString*)titleForIndex:(size_t)index {
   switch ([self settingForIndex:index]) {
     case CONTENT_SETTING_ALLOW:
       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);
     default:
       NOTREACHED();
   }
   return @"";
 }
 
 - (ContentSetting)settingForIndex:(size_t)index {
-  return showAsk_ ? kAskSettings[index] : kNoAskSettings[index];
+  return showSession_ ? kSessionSettings[index] : kNoSessionSettings[index];
 }
 
 - (size_t)indexForSetting:(ContentSetting)setting {
   for (size_t i = 0; i < [self menuItemCount]; ++i) {
     if ([self settingForIndex:i] == setting)
       return i;
   }
   NOTREACHED();
   return 0;
 }
 
 @end