Reintegrate 552 r66225-r66645....

chrome/browser/cocoa/content_settings_dialog_controller.h

 // 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 <Cocoa/Cocoa.h>
 
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
@@ skipping 30 matching lines @@
 class Profile;
 @class TabViewPickerTable;
 
 // This controller manages a dialog that lets the user manage the content
 // settings for several content setting types.
 @interface ContentSettingsDialogController
     : NSWindowController<NSWindowDelegate, NSTabViewDelegate> {
  @private
   IBOutlet NSTabView* tabView_;
   IBOutlet TabViewPickerTable* tabViewPicker_;
+  IBOutlet NSMatrix* pluginDefaultSettingMatrix_;
   Profile* profile_;  // weak
   IntegerPrefMember lastSelectedTab_;
   BooleanPrefMember clearSiteDataOnExit_;
   PrefChangeRegistrar registrar_;
   scoped_ptr<ContentSettingsDialogControllerInternal::PrefObserverBridge>
       observer_;  // Watches for pref changes.
 }
 
 // Show the content settings dialog associated with the given profile (or the
 // original profile if this is an incognito profile).  If no content settings
@@ skipping 24 matching lines @@
 @property(nonatomic) NSInteger cookieSettingIndex;
 @property(nonatomic) BOOL blockThirdPartyCookies;
 @property(nonatomic) BOOL clearSiteDataOnExit;
 @property(nonatomic) NSInteger imagesEnabledIndex;
 @property(nonatomic) NSInteger javaScriptEnabledIndex;
 @property(nonatomic) NSInteger popupsEnabledIndex;
 @property(nonatomic) NSInteger pluginsEnabledIndex;
 @property(nonatomic) NSInteger geolocationSettingIndex;
 @property(nonatomic) NSInteger notificationsSettingIndex;
 @end