[Mac] Organize some files into chrome/browser/ui/cocoa/content_settings/.

BUG=none
TEST=none
R=thakis
Review URL: http://codereview.chromium.org/6294008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71958 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/browser_window_cocoa.mm

@@ -26,7 +26,7 @@
 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
-#import "chrome/browser/ui/cocoa/collected_cookies_mac.h"
+#import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
 #import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"

chrome/browser/ui/cocoa/content_settings/OWNERS

+bauerb@chromium.org
+jochen@chromium.org
+thakis@chromium.org

chrome/browser/ui/cocoa/collected_cookies_mac.h → chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h

@@ -9,7 +9,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"
-#import "chrome/browser/ui/cocoa/cookie_tree_node.h"
+#import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h"
 #include "chrome/common/notification_registrar.h"
 
 @class CollectedCookiesWindowController;

chrome/browser/ui/cocoa/collected_cookies_mac.mm → chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/collected_cookies_mac.h"
+#import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 
 #include <vector>
 

chrome/browser/ui/cocoa/collected_cookies_mac_unittest.mm → chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm

@@ -9,7 +9,7 @@
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
-#import "chrome/browser/ui/cocoa/collected_cookies_mac.h"
+#import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 #include "chrome/test/testing_profile.h"
 
 namespace {

chrome/browser/ui/cocoa/content_setting_bubble_cocoa.mm → chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"
+#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"

chrome/browser/ui/cocoa/content_setting_bubble_cocoa_unittest.mm → chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"
+#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 

chrome/browser/ui/cocoa/cookie_details.mm → chrome/browser/ui/cocoa/content_settings/cookie_details.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/cocoa/cookie_details.h"
+#include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 
 #include "app/l10n_util_mac.h"
 #import "base/i18n/time_formatting.h"

chrome/browser/ui/cocoa/cookie_details_unittest.mm → chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm

@@ -4,7 +4,7 @@
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/ui/cocoa/cookie_details.h"
+#include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 #include "googleurl/src/gurl.h"
 #import "testing/gtest_mac.h"
 

chrome/browser/ui/cocoa/cookie_details_view_controller.mm → chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/cookie_details_view_controller.h"
+#import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #import "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
-#import "chrome/browser/ui/cocoa/cookie_tree_node.h"
+#import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 namespace {

chrome/browser/ui/cocoa/cookie_details_view_controller_unittest.mm → chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm

@@ -4,8 +4,8 @@
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/ui/cocoa/cookie_details.h"
-#include "chrome/browser/ui/cocoa/cookie_details_view_controller.h"
+#include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
+#include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
 
 namespace {
 

chrome/browser/ui/cocoa/cookie_tree_node.h → chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h

@@ -6,7 +6,7 @@
 
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/cookies_tree_model.h"
-#include "chrome/browser/ui/cocoa/cookie_details.h"
+#include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 
 @interface CocoaCookieTreeNode : NSObject {
   scoped_nsobject<NSString> title_;

chrome/browser/ui/cocoa/cookie_tree_node.mm → chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/cookie_tree_node.h"
+#import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h"
 
 #include "base/sys_string_conversions.h"
 

chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm → chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h"
+#import "chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/logging.h"

chrome/browser/ui/cocoa/simple_content_exceptions_window_controller_unittest.mm → chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h"
+#import "chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h"
 
 #import <Cocoa/Cocoa.h>
 

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

@@ -17,7 +17,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"
+#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -29,7 +29,7 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"
+#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm

@@ -21,9 +21,9 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
+#import "chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h"
 #import "chrome/browser/ui/cocoa/options/content_exceptions_window_controller.h"
 #import "chrome/browser/ui/cocoa/options/cookies_window_controller.h"
-#import "chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h"
 #import "chrome/browser/ui/cocoa/tab_view_picker_table.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"

chrome/browser/ui/cocoa/options/cookies_window_controller.h

@@ -8,7 +8,7 @@
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cookies_tree_model.h"
-#import "chrome/browser/ui/cocoa/cookie_tree_node.h"
+#import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h"
 #include "net/base/cookie_monster.h"
 
 @class CookiesWindowController;

chrome/browser/ui/cocoa/options/cookies_window_controller.mm

@@ -14,7 +14,7 @@
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
-#include "chrome/browser/ui/cocoa/cookie_details_view_controller.h"
+#include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"

chrome/chrome_browser.gypi

@@ -2737,8 +2737,6 @@
         'browser/ui/cocoa/clear_browsing_data_controller.mm',
         'browser/ui/cocoa/clickhold_button_cell.h',
         'browser/ui/cocoa/clickhold_button_cell.mm',
-        'browser/ui/cocoa/collected_cookies_mac.h',
-        'browser/ui/cocoa/collected_cookies_mac.mm',
         'browser/ui/cocoa/command_observer_bridge.h',
         'browser/ui/cocoa/command_observer_bridge.mm',
         'browser/ui/cocoa/confirm_quit_panel_controller.h',
@@ -2746,14 +2744,18 @@
         '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_setting_bubble_cocoa.h',
-        'browser/ui/cocoa/content_setting_bubble_cocoa.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/content_settings/collected_cookies_mac.h',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac.mm',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm',
+        'browser/ui/cocoa/content_settings/cookie_details.h',
+        'browser/ui/cocoa/content_settings/cookie_details.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller.h',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller.mm',
+        'browser/ui/cocoa/content_settings/cookie_tree_node.h',
+        'browser/ui/cocoa/content_settings/cookie_tree_node.mm',
+        'browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h',
+        'browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm',
         'browser/ui/cocoa/dev_tools_controller.h',
         'browser/ui/cocoa/dev_tools_controller.mm',
         'browser/ui/cocoa/dock_icon.h',
@@ -2983,8 +2985,6 @@
         'browser/ui/cocoa/shell_dialogs_mac.mm',
         'browser/ui/cocoa/sidebar_controller.h',
         'browser/ui/cocoa/sidebar_controller.mm',
-        'browser/ui/cocoa/simple_content_exceptions_window_controller.h',
-        'browser/ui/cocoa/simple_content_exceptions_window_controller.mm',
         'browser/ui/cocoa/speech_input_window_controller.h',
         'browser/ui/cocoa/speech_input_window_controller.mm',
         'browser/ui/cocoa/ssl_client_certificate_selector.mm',

chrome/chrome_tests.gypi

@@ -1484,12 +1484,13 @@
         'browser/ui/cocoa/clickhold_button_cell_unittest.mm',
         'browser/ui/cocoa/cocoa_test_helper.h',
         'browser/ui/cocoa/cocoa_test_helper.mm',
-        'browser/ui/cocoa/collected_cookies_mac_unittest.mm',
         'browser/ui/cocoa/command_observer_bridge_unittest.mm',
         'browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm',
-        'browser/ui/cocoa/content_setting_bubble_cocoa_unittest.mm',
-        'browser/ui/cocoa/cookie_details_unittest.mm',
-        'browser/ui/cocoa/cookie_details_view_controller_unittest.mm',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_unittest.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm',
+        'browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller_unittest.mm',
         'browser/ui/cocoa/download/download_item_button_unittest.mm',
         'browser/ui/cocoa/download/download_shelf_mac_unittest.mm',
         'browser/ui/cocoa/download/download_shelf_view_unittest.mm',
@@ -1560,7 +1561,6 @@
         'browser/ui/cocoa/rwhvm_editcommand_helper_unittest.mm',
         'browser/ui/cocoa/sad_tab_controller_unittest.mm',
         'browser/ui/cocoa/sad_tab_view_unittest.mm',
-        'browser/ui/cocoa/simple_content_exceptions_window_controller_unittest.mm',
         'browser/ui/cocoa/status_bubble_mac_unittest.mm',
         'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm',
         'browser/ui/cocoa/styled_text_field_cell_unittest.mm',