summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/browser_window_cocoa.mm
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 22:36:36 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 22:36:36 +0000
commit463194fe1a2940ab8c2d9a117d3bcccb5af0436d (patch)
treebdc07b868c64331bad36ddfb8db2c0c51d53154c /chrome/browser/ui/cocoa/browser_window_cocoa.mm
parent0d5490e5ec372922b5884fa8e94dd0967545ea6b (diff)
downloadchromium_src-463194fe1a2940ab8c2d9a117d3bcccb5af0436d.zip
chromium_src-463194fe1a2940ab8c2d9a117d3bcccb5af0436d.tar.gz
chromium_src-463194fe1a2940ab8c2d9a117d3bcccb5af0436d.tar.bz2
[Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/cocoa/
BUG=none TEST=compile and trybots Review URL: http://codereview.chromium.org/6339002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.mm')
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.mm6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index e2b3040..23d35c5 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -27,13 +27,13 @@
#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_dialog_controller.h"
#import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
-#import "chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h"
#import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
#import "chrome/browser/ui/cocoa/import_settings_dialog.h"
-#import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"
+#import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h"
#import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
#include "chrome/browser/ui/cocoa/repost_form_warning_mac.h"
#include "chrome/browser/ui/cocoa/restart_browser.h"