[Mac] Organize all import files into chrome/browser/ui/cocoa/importer/.

BUG=none
TEST=compiles
R=mirandac
Review URL: http://codereview.chromium.org/6371002

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

chrome/browser/app_controller_mac.mm

@@ -41,7 +41,7 @@
 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"
-#import "chrome/browser/ui/cocoa/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
 #import "chrome/browser/ui/cocoa/options/preferences_window_controller.h"
 #import "chrome/browser/ui/cocoa/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tab_window_controller.h"

chrome/browser/importer/importer.cc

@@ -34,7 +34,7 @@
 #include "chrome/browser/ui/views/importer_lock_view.h"
 #include "views/window/window.h"
 #elif defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/importer_lock_dialog.h"
+#include "chrome/browser/ui/cocoa/importer/importer_lock_dialog.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/gtk/import_lock_dialog_gtk.h"
 #endif

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

@@ -34,7 +34,7 @@
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/fullscreen_controller.h"
-#import "chrome/browser/ui/cocoa/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/toolbar_controller.h"

chrome/browser/ui/cocoa/browser_window_cocoa.mm

@@ -29,7 +29,7 @@
 #import "chrome/browser/ui/cocoa/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/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_settings_dialog.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"

chrome/browser/ui/cocoa/importer/OWNERS

+mirandac@chromium.org

chrome/browser/ui/cocoa/import_progress_dialog.h → chrome/browser/ui/cocoa/importer/import_progress_dialog.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_IMPORT_PROGRESS_DIALOG_H_
-#define CHROME_BROWSER_IMPORT_PROGRESS_DIALOG_H_
+#ifndef CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_
+#define CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -99,4 +99,4 @@ class ImporterObserverBridge : public ImporterHost::Observer {
   DISALLOW_COPY_AND_ASSIGN(ImporterObserverBridge);
 };
 
-#endif  // CHROME_BROWSER_IMPORT_PROGRESS_DIALOG_H_
+#endif  // CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_

chrome/browser/ui/cocoa/import_progress_dialog.mm → chrome/browser/ui/cocoa/importer/import_progress_dialog.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/import_progress_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_progress_dialog.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"

chrome/browser/ui/cocoa/import_settings_dialog.h → chrome/browser/ui/cocoa/importer/import_settings_dialog.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_COCOA_IMPORT_SETTINGS_DIALOG_H_
-#define CHROME_BROWSER_UI_COCOA_IMPORT_SETTINGS_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_SETTINGS_DIALOG_H_
+#define CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_SETTINGS_DIALOG_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -95,4 +95,4 @@ class Profile;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_IMPORT_SETTINGS_DIALOG_H_
+#endif  // CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_SETTINGS_DIALOG_H_

chrome/browser/ui/cocoa/import_settings_dialog.mm → chrome/browser/ui/cocoa/importer/import_settings_dialog.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/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"

chrome/browser/ui/cocoa/import_settings_dialog_unittest.mm → chrome/browser/ui/cocoa/importer/import_settings_dialog_unittest.mm

@@ -8,7 +8,7 @@
 #include "chrome/browser/importer/importer.h"
 #import "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 

chrome/browser/ui/cocoa/importer_lock_dialog.h → chrome/browser/ui/cocoa/importer/importer_lock_dialog.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_COCOA_IMPORTER_LOCK_DIALOG_H_
-#define CHROME_BROWSER_UI_COCOA_IMPORTER_LOCK_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORTER_LOCK_DIALOG_H_
+#define CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORTER_LOCK_DIALOG_H_
 #pragma once
 
 class ImporterHost;
@@ -18,4 +18,4 @@ void ShowWarning(ImporterHost* importer);
 
 }
 
-#endif  // CHROME_BROWSER_UI_COCOA_IMPORTER_LOCK_DIALOG_H_
+#endif  // CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORTER_LOCK_DIALOG_H_

chrome/browser/ui/cocoa/importer_lock_dialog.mm → chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm

@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "importer_lock_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/importer_lock_dialog.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/message_loop.h"

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

@@ -41,7 +41,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
-#import "chrome/browser/ui/cocoa/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"
 #import "chrome/browser/ui/cocoa/options/custom_home_pages_model.h"

chrome/chrome_browser.gypi

@@ -2874,12 +2874,12 @@
         'browser/ui/cocoa/hung_renderer_controller.mm',
         'browser/ui/cocoa/image_utils.h',
         'browser/ui/cocoa/image_utils.mm',
-        'browser/ui/cocoa/import_progress_dialog.h',
-        'browser/ui/cocoa/import_progress_dialog.mm',
-        'browser/ui/cocoa/import_settings_dialog.h',
-        'browser/ui/cocoa/import_settings_dialog.mm',
-        'browser/ui/cocoa/importer_lock_dialog.h',
-        'browser/ui/cocoa/importer_lock_dialog.mm',
+        'browser/ui/cocoa/importer/import_progress_dialog.h',
+        'browser/ui/cocoa/importer/import_progress_dialog.mm',
+        'browser/ui/cocoa/importer/import_settings_dialog.h',
+        'browser/ui/cocoa/importer/import_settings_dialog.mm',
+        'browser/ui/cocoa/importer/importer_lock_dialog.h',
+        'browser/ui/cocoa/importer/importer_lock_dialog.mm',
         'browser/ui/cocoa/info_bubble_view.h',
         'browser/ui/cocoa/info_bubble_view.mm',
         'browser/ui/cocoa/info_bubble_window.h',

chrome/chrome_tests.gypi

@@ -1522,7 +1522,7 @@
         'browser/ui/cocoa/hung_renderer_controller_unittest.mm',
         'browser/ui/cocoa/hyperlink_button_cell_unittest.mm',
         'browser/ui/cocoa/image_utils_unittest.mm',
-        'browser/ui/cocoa/import_settings_dialog_unittest.mm',
+        'browser/ui/cocoa/importer/import_settings_dialog_unittest.mm',
         'browser/ui/cocoa/info_bubble_view_unittest.mm',
         'browser/ui/cocoa/info_bubble_window_unittest.mm',
         'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm',