Reintegrate 552 r66225-r66645....

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.h"
 #include "app/l10n_util_mac.h"
 #include "app/table_model_observer.h"
 #include "base/command_line.h"
 #import "base/mac_util.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
+#include "chrome/browser/content_setting_combo_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 @interface ContentExceptionsWindowController (Private)
 - (id)initWithType:(ContentSettingsType)settingsType
        settingsMap:(HostContentSettingsMap*)settingsMap
     otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap;
 - (void)updateRow:(NSInteger)row
         withEntry:(const HostContentSettingsMap::PatternSettingPair&)entry
            forOtr:(BOOL)isOtr;
 - (void)adjustEditingButtons;
 - (void)modelDidChange;
-- (size_t)menuItemCount;
 - (NSString*)titleForIndex:(size_t)index;
-- (ContentSetting)settingForIndex:(size_t)index;
-- (size_t)indexForSetting:(ContentSetting)setting;
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 // PatternFormatter
 
 // A simple formatter that accepts text that vaguely looks like a pattern.
 @interface PatternFormatter : NSFormatter
 @end
 
 @implementation PatternFormatter
@@ skipping 75 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 for plug-ins;
-const ContentSetting kPluginSettings[] = { CONTENT_SETTING_ALLOW,
-                                           CONTENT_SETTING_ASK,
-                                           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 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 15 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_));
-    showSession_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
+    popup_model_.reset(new ContentSettingComboModel(settingsType_));
     otrAllowed_ = otrSettingsMap != NULL;
     tableObserver_.reset(new UpdatingContentSettingsObserver(self));
     updatesEnabled_ = YES;
 
     // TODO(thakis): autoremember window rect.
     // TODO(thakis): sorting support.
   }
   return self;
 }
 
 - (void)awakeFromNib {
   DCHECK([self window]);
   DCHECK_EQ(self, [[self window] delegate]);
   DCHECK(tableView_);
   DCHECK_EQ(self, [tableView_ dataSource]);
   DCHECK_EQ(self, [tableView_ delegate]);
 
   [[self window] setTitle:GetWindowTitle(settingsType_)];
 
   CGFloat minWidth = [[addButton_ superview] bounds].size.width +
                      [[doneButton_ superview] bounds].size.width;
   [self setMinWidth:minWidth];
 
   [self adjustEditingButtons];
 
   // Initialize menu for the data cell in the "action" column.
   scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"exceptionMenu"]);
-  for (size_t i = 0; i < [self menuItemCount]; ++i) {
-    scoped_nsobject<NSMenuItem> allowItem([[NSMenuItem alloc]
-        initWithTitle:[self titleForIndex:i] action:NULL keyEquivalent:@""]);
-    [allowItem.get() setTag:[self settingForIndex:i]];
+  for (int i = 0; i < popup_model_->GetItemCount(); ++i) {
+    NSString* title =
+        l10n_util::FixUpWindowsStyleLabel(popup_model_->GetItemAt(i));
+    scoped_nsobject<NSMenuItem> allowItem(
+        [[NSMenuItem alloc] initWithTitle:title action:NULL keyEquivalent:@""]);
+    [allowItem.get() setTag:popup_model_->SettingForIndex(i)];
     [menu.get() addItem:allowItem.get()];
   }
   NSCell* menuCell =
       [[tableView_ tableColumnWithIdentifier:@"action"] dataCell];
   [menuCell setMenu:menu.get()];
 
   NSCell* patternCell =
       [[tableView_ tableColumnWithIdentifier:@"pattern"] dataCell];
   [patternCell setFormatter:[[[PatternFormatter alloc] init] autorelease]];
 
@@ skipping 148 matching lines @@
   } else {
     entry = &model_->entry_at(row);
     isOtr = model_->entry_is_off_the_record(row) ? 1 : 0;
   }
 
   NSObject* result = nil;
   NSString* identifier = [tableColumn identifier];
   if ([identifier isEqualToString:@"pattern"]) {
     result = base::SysUTF8ToNSString(entry->first.AsString());
   } else if ([identifier isEqualToString:@"action"]) {
-    result = [NSNumber numberWithInt:[self indexForSetting:entry->second]];
+    result =
+        [NSNumber numberWithInt:popup_model_->IndexForSetting(entry->second)];
   } else if ([identifier isEqualToString:@"otr"]) {
     result = [NSNumber numberWithInt:isOtr];
   } else {
     NOTREACHED();
   }
   return result;
 }
 
 // Updates exception at |row| to contain the data in |entry|.
 - (void)updateRow:(NSInteger)row
@@ skipping 40 matching lines @@
   bool wasOtr = isOtr;
 
   // Modify it.
   NSString* identifier = [tableColumn identifier];
   if ([identifier isEqualToString:@"pattern"]) {
     entry.first = HostContentSettingsMap::Pattern(
                       base::SysNSStringToUTF8(object));
   }
   if ([identifier isEqualToString:@"action"]) {
     int index = [object intValue];
-    entry.second = [self settingForIndex:index];
+    entry.second = popup_model_->SettingForIndex(index);
   }
   if ([identifier isEqualToString:@"otr"]) {
     isOtr = [object intValue] != 0;
   }
 
   // Commit modification, if any.
   if (isNewRow) {
     newException_.reset();
     if (![identifier isEqualToString:@"pattern"]) {
       [tableView_ reloadData];
@@ skipping 43 matching lines @@
     return;
 
   // 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 {
-  if (settingsType_ == CONTENT_SETTINGS_TYPE_PLUGINS)
-    return arraysize(kPluginSettings);
-  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_ASK:
-      return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_ASK_BUTTON);
-    case CONTENT_SETTING_BLOCK:
-      return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_BLOCK_BUTTON);
-    case CONTENT_SETTING_SESSION_ONLY:
-      return l10n_util::GetNSStringWithFixup(
-          IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
-    default:
-      NOTREACHED();
-  }
-  return @"";
-}
-
-- (ContentSetting)settingForIndex:(size_t)index {
-  if (settingsType_ == CONTENT_SETTINGS_TYPE_PLUGINS)
-    return kPluginSettings[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