views: Organize all the import UI files into the chrome/browser/ui/views/importer/ directory.

BUG=None
TEST=trybots

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

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

9 files changed, 78 insertions, 76 deletions

diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc
index 23eb41c..1555584 100644
--- a/chrome/browser/ui/views/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmark_bar_view.cc
@@ -57,7 +57,7 @@
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
-#include "chrome/browser/ui/views/importer_view.h"
+#include "chrome/browser/ui/views/importer/importer_view.h"
 #endif
 
 using views::CustomButton;
diff --git a/chrome/browser/ui/views/importer_lock_view.cc b/chrome/browser/ui/views/importer/importer_lock_view.cc
index 5c23edd..477db0b 100644
--- a/chrome/browser/ui/views/importer_lock_view.cc
+++ b/chrome/browser/ui/views/importer/importer_lock_view.cc
@@ -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/views/importer_lock_view.h"
+#include "chrome/browser/ui/views/importer/importer_lock_view.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/importer_lock_view.h b/chrome/browser/ui/views/importer/importer_lock_view.h
index 97fa82a..663aeca 100644
--- a/chrome/browser/ui/views/importer_lock_view.h
+++ b/chrome/browser/ui/views/importer/importer_lock_view.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_LOCK_VIEW_H__
-#define CHROME_BROWSER_UI_VIEWS_IMPORTER_LOCK_VIEW_H__
+#ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_LOCK_VIEW_H__
+#define CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_LOCK_VIEW_H__
 #pragma once
 
 #include "views/view.h"
@@ -48,4 +48,4 @@ class ImporterLockView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(ImporterLockView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTER_LOCK_VIEW_H__
+#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_LOCK_VIEW_H__
diff --git a/chrome/browser/ui/views/importing_progress_view.cc b/chrome/browser/ui/views/importer/importer_progress_view.cc
index fce962f..c6b68a3 100644
--- a/chrome/browser/ui/views/importing_progress_view.cc
+++ b/chrome/browser/ui/views/importer/importer_progress_view.cc
@@ -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/views/importing_progress_view.h"
+#include "chrome/browser/ui/views/importer/importer_progress_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/chromium_strings.h"
@@ -16,14 +16,14 @@
 #include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImportingProgressView, public:
-
-ImportingProgressView::ImportingProgressView(const std::wstring& source_name,
-                                             int16 items,
-                                             ImporterHost* coordinator,
-                                             ImportObserver* observer,
-                                             HWND parent_window,
-                                             bool bookmarks_import)
+// ImporterProgressView, public:
+
+ImporterProgressView::ImporterProgressView(const std::wstring& source_name,
+                                           int16 items,
+                                           ImporterHost* coordinator,
+                                           ImportObserver* observer,
+                                           HWND parent_window,
+                                           bool bookmarks_import)
     : state_bookmarks_(new views::CheckmarkThrobber),
       state_searches_(new views::CheckmarkThrobber),
       state_passwords_(new views::CheckmarkThrobber),
@@ -73,7 +73,7 @@ ImportingProgressView::ImportingProgressView(const std::wstring& source_name,
   label_cookies_->set_parent_owned(false);
 }
 
-ImportingProgressView::~ImportingProgressView() {
+ImporterProgressView::~ImporterProgressView() {
   RemoveChildView(state_bookmarks_.get());
   RemoveChildView(state_searches_.get());
   RemoveChildView(state_passwords_.get());
@@ -98,9 +98,9 @@ ImportingProgressView::~ImportingProgressView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImportingProgressView, ImporterObserver implementation:
+// ImporterProgressView, ImporterObserver implementation:
 
-void ImportingProgressView::ImportItemStarted(importer::ImportItem item) {
+void ImporterProgressView::ImportItemStarted(importer::ImportItem item) {
   DCHECK(items_ & item);
   switch (item) {
     case importer::FAVORITES:
@@ -121,7 +121,7 @@ void ImportingProgressView::ImportItemStarted(importer::ImportItem item) {
   }
 }
 
-void ImportingProgressView::ImportItemEnded(importer::ImportItem item) {
+void ImporterProgressView::ImportItemEnded(importer::ImportItem item) {
   DCHECK(items_ & item);
   switch (item) {
     case importer::FAVORITES:
@@ -147,11 +147,11 @@ void ImportingProgressView::ImportItemEnded(importer::ImportItem item) {
   }
 }
 
-void ImportingProgressView::ImportStarted() {
+void ImporterProgressView::ImportStarted() {
   importing_ = true;
 }
 
-void ImportingProgressView::ImportEnded() {
+void ImporterProgressView::ImportEnded() {
   // This can happen because:
   // - the import completed successfully.
   // - the import was canceled by the user.
@@ -166,44 +166,44 @@ void ImportingProgressView::ImportEnded() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImportingProgressView, views::View overrides:
+// ImporterProgressView, views::View overrides:
 
-gfx::Size ImportingProgressView::GetPreferredSize() {
+gfx::Size ImporterProgressView::GetPreferredSize() {
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS,
       IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES));
 }
 
-void ImportingProgressView::ViewHierarchyChanged(bool is_add,
-                                                 views::View* parent,
-                                                 views::View* child) {
+void ImporterProgressView::ViewHierarchyChanged(bool is_add,
+                                                views::View* parent,
+                                                views::View* child) {
   if (is_add && child == this)
     InitControlLayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImportingProgressView, views::DialogDelegate implementation:
+// ImporterProgressView, views::DialogDelegate implementation:
 
-int ImportingProgressView::GetDialogButtons() const {
+int ImporterProgressView::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
-std::wstring ImportingProgressView::GetDialogButtonLabel(
+std::wstring ImporterProgressView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   DCHECK(button == MessageBoxFlags::DIALOGBUTTON_CANCEL);
   return UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_CANCEL));
 }
 
-bool ImportingProgressView::IsModal() const {
+bool ImporterProgressView::IsModal() const {
   return parent_window_ != NULL;
 }
 
-std::wstring ImportingProgressView::GetWindowTitle() const {
+std::wstring ImporterProgressView::GetWindowTitle() const {
   return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_TITLE));
 }
 
-bool ImportingProgressView::Cancel() {
+bool ImporterProgressView::Cancel() {
   // When the user cancels the import, we need to tell the coordinator to stop
   // importing and return false so that the window lives long enough to receive
   // ImportEnded, which will close the window. Closing the window results in
@@ -217,14 +217,14 @@ bool ImportingProgressView::Cancel() {
   return false;
 }
 
-views::View* ImportingProgressView::GetContentsView() {
+views::View* ImporterProgressView::GetContentsView() {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImportingProgressView, private:
+// ImporterProgressView, private:
 
-void ImportingProgressView::InitControlLayout() {
+void ImporterProgressView::InitControlLayout() {
   using views::GridLayout;
   using views::ColumnSet;
 
@@ -303,7 +303,7 @@ void StartImportingWithUI(HWND parent_window,
                           ImportObserver* observer,
                           bool first_run) {
   DCHECK(items != 0);
-  ImportingProgressView* v = new ImportingProgressView(
+  ImporterProgressView* v = new ImporterProgressView(
       source_profile.description, items, coordinator, observer, parent_window,
       source_profile.browser_type == importer::BOOKMARKS_HTML);
   views::Window* window =
diff --git a/chrome/browser/ui/views/importing_progress_view.h b/chrome/browser/ui/views/importer/importer_progress_view.h
index 5ad1d00..fb3373c 100644
--- a/chrome/browser/ui/views/importing_progress_view.h
+++ b/chrome/browser/ui/views/importer/importer_progress_view.h
@@ -1,11 +1,13 @@
-// Copyright (c) 2010 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_IMPORTING_PROGRESS_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_IMPORTING_PROGRESS_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_PROGRESS_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_PROGRESS_VIEW_H_
 #pragma once
 
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "views/view.h"
@@ -17,42 +19,42 @@ class CheckmarkThrobber;
 class Label;
 }
 
-class ImportingProgressView : public views::View,
-                              public views::DialogDelegate,
-                              public ImporterHost::Observer {
+class ImporterProgressView : public views::View,
+                             public views::DialogDelegate,
+                             public ImporterHost::Observer {
  public:
   // |items| is a bitmask of ImportItems being imported.
   // |bookmark_import| is true if we're importing bookmarks from a
   // bookmarks.html file.
-  ImportingProgressView(const std::wstring& source_name,
-                        int16 items,
-                        ImporterHost* coordinator,
-                        ImportObserver* observer,
-                        HWND parent_window,
-                        bool bookmarks_import);
-  virtual ~ImportingProgressView();
+  ImporterProgressView(const std::wstring& source_name,
+                       int16 items,
+                       ImporterHost* coordinator,
+                       ImportObserver* observer,
+                       HWND parent_window,
+                       bool bookmarks_import);
+  virtual ~ImporterProgressView();
 
  protected:
   // Overridden from ImporterHost::Observer:
-  virtual void ImportItemStarted(importer::ImportItem item);
-  virtual void ImportItemEnded(importer::ImportItem item);
-  virtual void ImportStarted();
-  virtual void ImportEnded();
+  virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE;
+  virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE;
+  virtual void ImportStarted() OVERRIDE;
+  virtual void ImportEnded() OVERRIDE;
 
   // Overridden from views::DialogDelegate:
-  virtual int GetDialogButtons() const;
+  virtual int GetDialogButtons() const OVERRIDE;
   virtual std::wstring GetDialogButtonLabel(
-      MessageBoxFlags::DialogButton button) const;
-  virtual bool IsModal() const;
-  virtual std::wstring GetWindowTitle() const;
-  virtual bool Cancel();
-  virtual views::View* GetContentsView();
+      MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual bool IsModal() const OVERRIDE;
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
+  virtual views::View* GetContentsView() OVERRIDE;
 
   // Overridden from views::View:
-  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
 
  private:
   // Set up the control layout within this dialog.
@@ -89,7 +91,7 @@ class ImportingProgressView : public views::View,
   // Are we importing a bookmarks.html file?
   bool bookmarks_import_;
 
-  DISALLOW_COPY_AND_ASSIGN(ImportingProgressView);
+  DISALLOW_COPY_AND_ASSIGN(ImporterProgressView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTING_PROGRESS_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_PROGRESS_VIEW_H_
diff --git a/chrome/browser/ui/views/importer_view.cc b/chrome/browser/ui/views/importer/importer_view.cc
index 8a1d2d8..e784ea2f 100644
--- a/chrome/browser/ui/views/importer_view.cc
+++ b/chrome/browser/ui/views/importer/importer_view.cc
@@ -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/views/importer_view.h"
+#include "chrome/browser/ui/views/importer/importer_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/importer_view.h b/chrome/browser/ui/views/importer/importer_view.h
index c1ed9b2..1a4cd31 100644
--- a/chrome/browser/ui/views/importer_view.h
+++ b/chrome/browser/ui/views/importer/importer_view.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_VIEWS_IMPORTER_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_IMPORTER_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_VIEW_H_
 #pragma once
 
 #include "base/string16.h"
@@ -112,4 +112,4 @@ class ImporterView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(ImporterView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTER_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORTER_VIEW_H_
diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc
index 19ace33..0b889bd 100644
--- a/chrome/browser/ui/views/options/content_page_view.cc
+++ b/chrome/browser/ui/views/options/content_page_view.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/ui/views/options/content_page_view.h"
 
-#include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
+#include <windows.h>
 
 #include <string>
 
@@ -19,9 +19,9 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/sync/sync_setup_wizard.h"
-#include "chrome/browser/ui/views/importer_view.h"
+#include "chrome/browser/sync/sync_ui_util.h"
+#include "chrome/browser/ui/views/importer/importer_view.h"
 #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"
 #include "chrome/browser/ui/views/options/options_group_view.h"
 #include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 36092bb..b0911bd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3027,12 +3027,12 @@
         'browser/ui/views/html_dialog_view.cc',
         'browser/ui/views/html_dialog_view.h',
         'browser/ui/views/hung_renderer_view.cc',
-        'browser/ui/views/importer_lock_view.cc',
-        'browser/ui/views/importer_lock_view.h',
-        'browser/ui/views/importer_view.cc',
-        'browser/ui/views/importer_view.h',
-        'browser/ui/views/importing_progress_view.cc',
-        'browser/ui/views/importing_progress_view.h',
+        'browser/ui/views/importer/importer_lock_view.cc',
+        'browser/ui/views/importer/importer_lock_view.h',
+        'browser/ui/views/importer/importer_progress_view.cc',
+        'browser/ui/views/importer/importer_progress_view.h',
+        'browser/ui/views/importer/importer_view.cc',
+        'browser/ui/views/importer/importer_view.h',
         'browser/ui/views/indexed_db_info_view.cc',
         'browser/ui/views/indexed_db_info_view.h',
         'browser/ui/views/info_bubble.cc',