Mac: Move prefs around in preparation for the content settings window.

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 455 matching lines @@
         'browser/cocoa/clear_browsing_data_controller.h',
         'browser/cocoa/clear_browsing_data_controller.mm',
         'browser/cocoa/clickhold_button_cell.h',
         'browser/cocoa/clickhold_button_cell.mm',
         'browser/cocoa/command_observer_bridge.h',
         'browser/cocoa/command_observer_bridge.mm',
         'browser/cocoa/constrained_window_mac.h',
         'browser/cocoa/constrained_window_mac.mm',
         'browser/cocoa/content_blocked_bubble_controller.h',
         'browser/cocoa/content_blocked_bubble_controller.mm',
+        'browser/cocoa/content_settings_dialog_controller.h',
+        'browser/cocoa/content_settings_dialog_controller.mm',
         'browser/cocoa/cookie_tree_node.h',
         'browser/cocoa/cookie_tree_node.mm',
         'browser/cocoa/cookies_window_controller.h',
         'browser/cocoa/cookies_window_controller.mm',
         'browser/cocoa/custom_home_pages_model.h',
         'browser/cocoa/custom_home_pages_model.mm',
         'browser/cocoa/delayedmenu_button.h',
         'browser/cocoa/delayedmenu_button.mm',
         'browser/cocoa/disclosure_view_controller.h',
         'browser/cocoa/disclosure_view_controller.mm',
@@ skipping 1865 matching lines @@
                   'app/nibs/BookmarkEditor.xib',
                   'app/nibs/BookmarkManager.xib',
                   'app/nibs/BookmarkNameFolder.xib',
                   'app/nibs/ClearBrowsingData.xib',
                   'app/nibs/Cookies.xib',
                   'app/nibs/ContentBlockedCookies.xib',
                   'app/nibs/ContentBlockedImages.xib',
                   'app/nibs/ContentBlockedJavaScript.xib',
                   'app/nibs/ContentBlockedPlugins.xib',
                   'app/nibs/ContentBlockedPopups.xib',
+                  'app/nibs/ContentSettings.xib',
                   'app/nibs/DownloadItem.xib',
                   'app/nibs/DownloadShelf.xib',
                   'app/nibs/EditSearchEngine.xib',
                   'app/nibs/ExtensionInstalledBubble.xib',
                   'app/nibs/FirstRunDialog.xib',
                   'app/nibs/FontLanguageSettings.xib',
                   'app/nibs/HttpAuthLoginSheet.xib',
                   'app/nibs/HungRendererDialog.xib',
                   'app/nibs/ImportSettingsDialog.xib',
                   'app/nibs/ImportProgressDialog.xib',
@@ skipping 470 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: