[Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/coc...

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 71453)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -2756,22 +2756,14 @@
         'browser/ui/cocoa/constrained_html_delegate_mac.mm',
         'browser/ui/cocoa/constrained_window_mac.h',
         'browser/ui/cocoa/constrained_window_mac.mm',
-        'browser/ui/cocoa/content_exceptions_window_controller.h',
-        'browser/ui/cocoa/content_exceptions_window_controller.mm',
         'browser/ui/cocoa/content_setting_bubble_cocoa.h',
         'browser/ui/cocoa/content_setting_bubble_cocoa.mm',
-        'browser/ui/cocoa/content_settings_dialog_controller.h',
-        'browser/ui/cocoa/content_settings_dialog_controller.mm',
         'browser/ui/cocoa/cookie_details.h',
         'browser/ui/cocoa/cookie_details.mm',
         'browser/ui/cocoa/cookie_details_view_controller.h',
         'browser/ui/cocoa/cookie_details_view_controller.mm',
         'browser/ui/cocoa/cookie_tree_node.h',
         'browser/ui/cocoa/cookie_tree_node.mm',
-        'browser/ui/cocoa/cookies_window_controller.h',
-        'browser/ui/cocoa/cookies_window_controller.mm',
-        'browser/ui/cocoa/custom_home_pages_model.h',
-        'browser/ui/cocoa/custom_home_pages_model.mm',
         'browser/ui/cocoa/dev_tools_controller.h',
         'browser/ui/cocoa/dev_tools_controller.mm',
         'browser/ui/cocoa/dock_icon.h',
@@ -2795,8 +2787,6 @@
         'browser/ui/cocoa/download/download_util_mac.mm',
         'browser/ui/cocoa/draggable_button.h',
         'browser/ui/cocoa/draggable_button.mm',
-        'browser/ui/cocoa/edit_search_engine_cocoa_controller.h',
-        'browser/ui/cocoa/edit_search_engine_cocoa_controller.mm',
         'browser/ui/cocoa/encoding_menu_controller_delegate_mac.h',
         'browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm',
         'browser/ui/cocoa/event_utils.h',
@@ -2852,8 +2842,6 @@
         'browser/ui/cocoa/floating_bar_backing_view.mm',
         'browser/ui/cocoa/focus_tracker.h',
         'browser/ui/cocoa/focus_tracker.mm',
-        'browser/ui/cocoa/font_language_settings_controller.h',
-        'browser/ui/cocoa/font_language_settings_controller.mm',
         'browser/ui/cocoa/framed_browser_window.h',
         'browser/ui/cocoa/framed_browser_window.mm',
         'browser/ui/cocoa/fullscreen_controller.h',
@@ -2909,8 +2897,6 @@
         'browser/ui/cocoa/keystone_glue.mm',
         'browser/ui/cocoa/keystone_infobar.h',
         'browser/ui/cocoa/keystone_infobar.mm',
-        'browser/ui/cocoa/keyword_editor_cocoa_controller.h',
-        'browser/ui/cocoa/keyword_editor_cocoa_controller.mm',
         'browser/ui/cocoa/l10n_util.h',
         'browser/ui/cocoa/l10n_util.mm',
         'browser/ui/cocoa/location_bar/autocomplete_text_field.h',
@@ -2969,10 +2955,26 @@
         'browser/ui/cocoa/objc_method_swizzle.mm',
         'browser/ui/cocoa/objc_zombie.h',
         'browser/ui/cocoa/objc_zombie.mm',
+        'browser/ui/cocoa/options/content_exceptions_window_controller.h',
+        'browser/ui/cocoa/options/content_exceptions_window_controller.mm',
+        'browser/ui/cocoa/options/content_settings_dialog_controller.h',
+        'browser/ui/cocoa/options/content_settings_dialog_controller.mm',
+        'browser/ui/cocoa/options/cookies_window_controller.h',
+        'browser/ui/cocoa/options/cookies_window_controller.mm',
+        'browser/ui/cocoa/options/custom_home_pages_model.h',
+        'browser/ui/cocoa/options/custom_home_pages_model.mm',
+        'browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h',
+        'browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm',
+        'browser/ui/cocoa/options/font_language_settings_controller.h',
+        'browser/ui/cocoa/options/font_language_settings_controller.mm',
+        'browser/ui/cocoa/options/keyword_editor_cocoa_controller.h',
+        'browser/ui/cocoa/options/keyword_editor_cocoa_controller.mm',
+        'browser/ui/cocoa/options/preferences_window_controller.h',
+        'browser/ui/cocoa/options/preferences_window_controller.mm',
+        'browser/ui/cocoa/options/search_engine_list_model.h',
+        'browser/ui/cocoa/options/search_engine_list_model.mm',
         'browser/ui/cocoa/page_info_bubble_controller.h',
         'browser/ui/cocoa/page_info_bubble_controller.mm',
-        'browser/ui/cocoa/preferences_window_controller.h',
-        'browser/ui/cocoa/preferences_window_controller.mm',
         'browser/ui/cocoa/previewable_contents_controller.h',
         'browser/ui/cocoa/previewable_contents_controller.mm',
         'browser/ui/cocoa/reload_button.h',
@@ -2990,8 +2992,6 @@
         'browser/ui/cocoa/scoped_authorizationref.h',
         'browser/ui/cocoa/search_engine_dialog_controller.h',
         'browser/ui/cocoa/search_engine_dialog_controller.mm',
-        'browser/ui/cocoa/search_engine_list_model.h',
-        'browser/ui/cocoa/search_engine_list_model.mm',
         'browser/ui/cocoa/shell_dialogs_mac.mm',
         'browser/ui/cocoa/side_tab_strip_controller.h',
         'browser/ui/cocoa/side_tab_strip_controller.mm',