Rename ChromeViews namespace to views

http://crbug.com/2188

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

1 files changed, 19 insertions, 21 deletions

diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h
index 6906fee..1f3002d 100644
--- a/chrome/browser/views/importer_view.h
+++ b/chrome/browser/views/importer_view.h
@@ -11,12 +11,10 @@
 #include "chrome/views/native_button.h"
 #include "chrome/views/view.h"
 
-namespace ChromeViews {
-
+namespace views {
 class CheckBox;
 class Label;
 class Window;
-
 }
 
 class Profile;
@@ -25,28 +23,28 @@ class Profile;
 // import from other browsers.
 // Note: The UI team hasn't defined yet how the import UI will look like.
 //       So now use dialog as a placeholder.
-class ImporterView : public ChromeViews::View,
-                     public ChromeViews::DialogDelegate,
-                     public ChromeViews::ComboBox::Model,
+class ImporterView : public views::View,
+                     public views::DialogDelegate,
+                     public views::ComboBox::Model,
                      public ImportObserver {
  public:
   explicit ImporterView(Profile* profile);
   virtual ~ImporterView();
 
-  // Overridden from ChromeViews::View.
+  // Overridden from views::View.
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
 
-  // Overridden from ChromeViews::DialogDelegate:
+  // Overridden from views::DialogDelegate:
   virtual std::wstring GetDialogButtonLabel(DialogButton button) const;
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual bool Accept();
-  virtual ChromeViews::View* GetContentsView();
+  virtual views::View* GetContentsView();
 
-  // Overridden from ChromeViews::ComboBox::Model.
-  virtual int GetItemCount(ChromeViews::ComboBox* source);
-  virtual std::wstring GetItemAt(ChromeViews::ComboBox* source, int index);
+  // Overridden from views::ComboBox::Model.
+  virtual int GetItemCount(views::ComboBox* source);
+  virtual std::wstring GetItemAt(views::ComboBox* source, int index);
 
   // Overridden from ImportObserver:
   virtual void ImportCanceled();
@@ -57,15 +55,15 @@ class ImporterView : public ChromeViews::View,
   void SetupControl();
 
   // Creates and initializes a new check-box.
-  ChromeViews::CheckBox* InitCheckbox(const std::wstring& text, bool checked);
-
-  ChromeViews::Label* import_from_label_;
-  ChromeViews::ComboBox* profile_combobox_;
-  ChromeViews::Label* import_items_label_;
-  ChromeViews::CheckBox* history_checkbox_;
-  ChromeViews::CheckBox* favorites_checkbox_;
-  ChromeViews::CheckBox* passwords_checkbox_;
-  ChromeViews::CheckBox* search_engines_checkbox_;
+  views::CheckBox* InitCheckbox(const std::wstring& text, bool checked);
+
+  views::Label* import_from_label_;
+  views::ComboBox* profile_combobox_;
+  views::Label* import_items_label_;
+  views::CheckBox* history_checkbox_;
+  views::CheckBox* favorites_checkbox_;
+  views::CheckBox* passwords_checkbox_;
+  views::CheckBox* search_engines_checkbox_;
 
   scoped_refptr<ImporterHost> importer_host_;