importer: Cleanup the names of files and classes under ui/cocoa/importer directory.

- Match the names of the files with the current pattern used in the ui/gtk/importer directory.

BUG=None
TEST=existing unit_tests

Review URL: http://codereview.chromium.org/6628039

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

10 files changed, 30 insertions, 30 deletions

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 7cba634..fca66bb 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -37,7 +37,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/importer/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 #import "chrome/browser/ui/cocoa/options/preferences_window_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
@@ -867,7 +867,7 @@ void RecordLastRunAppBundlePath() {
               switches::kDisableTabbedOptions)) {
         UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"),
                                   defaultProfile);
-        [ImportSettingsDialogController
+        [ImportDialogController
             showImportSettingsDialogForProfile:defaultProfile];
       } else {
         if (Browser* browser = ActivateBrowser(defaultProfile)) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index cad2d78..4e7eda5 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -33,7 +33,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/importer/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
@@ -732,7 +732,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 }
 
 - (IBAction)importBookmarks:(id)sender {
-  [ImportSettingsDialogController showImportSettingsDialogForProfile:
+  [ImportDialogController showImportSettingsDialogForProfile:
       browser_->profile()];
 }
 
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index a554504..dae1719 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -26,12 +26,12 @@
 #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"
+#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#import "chrome/browser/ui/cocoa/nsmenuitem_additions.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"
 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
@@ -342,7 +342,7 @@ void BrowserWindowCocoa::ShowClearBrowsingDataDialog() {
 }
 
 void BrowserWindowCocoa::ShowImportDialog() {
-  [ImportSettingsDialogController
+  [ImportDialogController
           showImportSettingsDialogForProfile:browser_->profile()];
 }
 
diff --git a/chrome/browser/ui/cocoa/importer/import_settings_dialog.h b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h
index c2f922e..74564f0 100644
--- a/chrome/browser/ui/cocoa/importer/import_settings_dialog.h
+++ b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.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_IMPORT_SETTINGS_DIALOG_H_
-#define CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_SETTINGS_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_DIALOG_COCOA_H_
+#define CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_DIALOG_COCOA_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -16,7 +16,7 @@ class ImporterListObserverBridge;
 
 // Controller for the Import Bookmarks and Settings dialog.  This controller
 // automatically autoreleases itself when its associated dialog is dismissed.
-@interface ImportSettingsDialogController : NSWindowController {
+@interface ImportDialogController : NSWindowController {
  @private
   NSWindow* parentWindow_;  // weak
   Profile* profile_;  // weak
@@ -70,7 +70,7 @@ class ImporterListObserverBridge;
 
 @end
 
-@interface ImportSettingsDialogController (TestingAPI)
+@interface ImportDialogController (TestingAPI)
 
 // Initialize by providing an array of source profile dictionaries. Exposed for
 // unit testing but also called by -[initWithProfile:].
@@ -101,4 +101,4 @@ class ImporterListObserverBridge;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_SETTINGS_DIALOG_H_
+#endif  // CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_DIALOG_COCOA_H_
diff --git a/chrome/browser/ui/cocoa/importer/import_settings_dialog.mm b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.mm
index bba2a2c..0642b94 100644
--- a/chrome/browser/ui/cocoa/importer/import_settings_dialog.mm
+++ b/chrome/browser/ui/cocoa/importer/import_dialog_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/importer/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 
 #include "base/compiler_specific.h"
 #include "base/mac/mac_util.h"
@@ -15,21 +15,21 @@
 #include "ui/base/l10n/l10n_util_mac.h"
 
 // Bridge to receive observer messages from an ImporterList and relay
-// them to the ImportSettingsDialogController.
+// them to the ImportDialogController.
 class ImporterListObserverBridge : public ImporterList::Observer {
  public:
   explicit ImporterListObserverBridge(
-      ImportSettingsDialogController *controller);
+      ImportDialogController *controller);
 
  private:
   // ImporterList::Observer:
   virtual void SourceProfilesLoaded() OVERRIDE;
 
-  ImportSettingsDialogController* window_controller_;  // weak, owns us.
+  ImportDialogController* window_controller_;  // weak, owns us.
 };
 
 ImporterListObserverBridge::ImporterListObserverBridge(
-    ImportSettingsDialogController *controller)
+    ImportDialogController *controller)
   : window_controller_(controller) {
 }
 
@@ -43,7 +43,7 @@ bool importSettingsDialogVisible = false;
 
 }  // namespace
 
-@interface ImportSettingsDialogController ()
+@interface ImportDialogController ()
 
 @property(assign, readwrite, nonatomic) BOOL historyAvailable;
 @property(assign, readwrite, nonatomic) BOOL favoritesAvailable;
@@ -92,7 +92,7 @@ bool importSettingsDialogVisible = false;
 
 @end
 
-@interface ImportSettingsDialogController (Private)
+@interface ImportDialogController (Private)
 
 // Initialize the dialog controller with either the default profile or
 // the profile for the current browser.
@@ -106,7 +106,7 @@ bool importSettingsDialogVisible = false;
 
 @end
 
-@implementation ImportSettingsDialogController
+@implementation ImportDialogController
 
 @synthesize sourceBrowserIndex = sourceBrowserIndex_;
 @synthesize importHistory = importHistory_;
@@ -128,8 +128,8 @@ bool importSettingsDialogVisible = false;
   // Don't display if already visible.
   if (importSettingsDialogVisible)
     return;
-  ImportSettingsDialogController* controller =
-      [[ImportSettingsDialogController alloc] initWithProfile:profile];
+  ImportDialogController* controller =
+      [[ImportDialogController alloc] initWithProfile:profile];
   [controller runModalDialog];
 }
 
diff --git a/chrome/browser/ui/cocoa/importer/import_settings_dialog_unittest.mm b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa_unittest.mm
index 22630a4..2a76dfb 100644
--- a/chrome/browser/ui/cocoa/importer/import_settings_dialog_unittest.mm
+++ b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa_unittest.mm
@@ -8,13 +8,13 @@
 #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/importer/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 class ImportSettingsDialogTest : public CocoaTest {
  public:
-  ImportSettingsDialogController* controller_;
+  ImportDialogController* controller_;
 
   virtual void SetUp() {
     CocoaTest::SetUp();
@@ -39,7 +39,7 @@ class ImportSettingsDialogTest : public CocoaTest {
                                      services:caminoServices];
     NSArray* browsers = [NSArray arrayWithObjects:
                          mockSafari, mockFirefox, mockCamino, nil];
-    controller_ = [[ImportSettingsDialogController alloc]
+    controller_ = [[ImportDialogController alloc]
                    initWithSourceProfiles:browsers];
   }
 
diff --git a/chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm b/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm
index aca152c..ab53984 100644
--- a/chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm
+++ b/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog.h b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h
index 48d2880..48d2880 100644
--- a/chrome/browser/ui/cocoa/importer/import_progress_dialog.h
+++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h
diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog.mm b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm
index c185b31..9befa8c 100644
--- a/chrome/browser/ui/cocoa/importer/import_progress_dialog.mm
+++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog_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/importer/import_progress_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
diff --git a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm
index a0d2d46..14baa89 100644
--- a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm
+++ b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "ui/base/l10n/l10n_util.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_aedesc.h"
@@ -37,7 +36,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/importer/import_settings_dialog.h"
+#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.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"
@@ -63,6 +62,7 @@
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image.h"
@@ -1360,7 +1360,7 @@ const int kDisabledIndex = 1;
 // Called to import data from other browsers (Safari, Firefox, etc).
 - (IBAction)importData:(id)sender {
   UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"), profile_);
-  [ImportSettingsDialogController showImportSettingsDialogForProfile:profile_];
+  [ImportDialogController showImportSettingsDialogForProfile:profile_];
 }
 
 - (IBAction)resetThemeToDefault:(id)sender {