diff options
Diffstat (limited to 'chrome')
26 files changed, 41 insertions, 38 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 13559a2..79cdeff 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/content_settings/OWNERS b/chrome/browser/ui/cocoa/content_settings/OWNERS new file mode 100644 index 0000000..44115d7 --- /dev/null +++ b/chrome/browser/ui/cocoa/content_settings/OWNERS @@ -0,0 +1,3 @@ +bauerb@chromium.org +jochen@chromium.org +thakis@chromium.org diff --git a/chrome/browser/ui/cocoa/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h index 0329819..44c0e7d 100644 --- a/chrome/browser/ui/cocoa/collected_cookies_mac.h +++ b/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; diff --git a/chrome/browser/ui/cocoa/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index ef19437..40c4dff 100644 --- a/chrome/browser/ui/cocoa/collected_cookies_mac.mm +++ b/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> diff --git a/chrome/browser/ui/cocoa/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm index a7bc6b7..b28db89 100644 --- a/chrome/browser/ui/cocoa/collected_cookies_mac_unittest.mm +++ b/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 { diff --git a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h index 362f3ea..362f3ea 100644 --- a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h diff --git a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm index e9fc71c6..20e2686 100644 --- a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index e67b0aa..88d485b 100644 --- a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa_unittest.mm +++ b/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> diff --git a/chrome/browser/ui/cocoa/cookie_details.h b/chrome/browser/ui/cocoa/content_settings/cookie_details.h index 614c87c..614c87c 100644 --- a/chrome/browser/ui/cocoa/cookie_details.h +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.h diff --git a/chrome/browser/ui/cocoa/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm index e88cf27..ad085e5 100644 --- a/chrome/browser/ui/cocoa/cookie_details.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm index 0f7d711..4169c2a 100644 --- a/chrome/browser/ui/cocoa/cookie_details_unittest.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/cookie_details_view_controller.h b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h index 63fff93..63fff93 100644 --- a/chrome/browser/ui/cocoa/cookie_details_view_controller.h +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h diff --git a/chrome/browser/ui/cocoa/cookie_details_view_controller.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm index d3e1ea5..02baaff 100644 --- a/chrome/browser/ui/cocoa/cookie_details_view_controller.mm +++ b/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 { diff --git a/chrome/browser/ui/cocoa/cookie_details_view_controller_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm index 4a7e5da..0965f7d 100644 --- a/chrome/browser/ui/cocoa/cookie_details_view_controller_unittest.mm +++ b/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 { diff --git a/chrome/browser/ui/cocoa/cookie_tree_node.h b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h index 400244c..175a1b5 100644 --- a/chrome/browser/ui/cocoa/cookie_tree_node.h +++ b/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_; diff --git a/chrome/browser/ui/cocoa/cookie_tree_node.mm b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm index eeddadd..e6a08bd 100644 --- a/chrome/browser/ui/cocoa/cookie_tree_node.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h b/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h index 61fd48c..61fd48c 100644 --- a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h +++ b/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h diff --git a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm index 213e449..3853b16 100644 --- a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller_unittest.mm b/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller_unittest.mm index 58d1c84..ec5b2f5 100644 --- a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller_unittest.mm +++ b/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> diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 48abf2e..ac6b564 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 35aa08c..2d0f298 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm b/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm index 532eae9..c164584 100644 --- a/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm +++ b/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" diff --git a/chrome/browser/ui/cocoa/options/cookies_window_controller.h b/chrome/browser/ui/cocoa/options/cookies_window_controller.h index 85d8b3e..d77c5ad 100644 --- a/chrome/browser/ui/cocoa/options/cookies_window_controller.h +++ b/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; diff --git a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm index e014bdf..64f2b0c 100644 --- a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm +++ b/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" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 41b6a48..d51f6b2 100644 --- a/chrome/chrome_browser.gypi +++ b/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', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 8d69ffd..97ba825 100644 --- a/chrome/chrome_tests.gypi +++ b/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', |