1 files changed, 27 insertions, 27 deletions

diff --git a/chrome/browser/views/download_tab_view.h b/chrome/browser/views/download_tab_view.h
index 6152908..1ba7433 100644
--- a/chrome/browser/views/download_tab_view.h
+++ b/chrome/browser/views/download_tab_view.h
@@ -24,9 +24,9 @@ namespace base {
 class Timer;
 }
 
-class DownloadItemTabView : public ChromeViews::View,
-                            public ChromeViews::LinkController,
-                            public ChromeViews::NativeButton::Listener {
+class DownloadItemTabView : public views::View,
+                            public views::LinkController,
+                            public views::NativeButton::Listener {
  public:
   DownloadItemTabView();
   virtual ~DownloadItemTabView();
@@ -36,8 +36,8 @@ class DownloadItemTabView : public ChromeViews::View,
   virtual void Paint(ChromeCanvas* canvas);
   void PaintBackground(ChromeCanvas* canvas);
   virtual gfx::Size GetPreferredSize();
-  virtual bool OnMousePressed(const ChromeViews::MouseEvent& event);
-  virtual bool OnMouseDragged(const ChromeViews::MouseEvent& event);
+  virtual bool OnMousePressed(const views::MouseEvent& event);
+  virtual bool OnMouseDragged(const views::MouseEvent& event);
 
   // Mode specific layouts
   void LayoutDate();
@@ -47,10 +47,10 @@ class DownloadItemTabView : public ChromeViews::View,
   void LayoutPromptDangerousDownload();
 
   // LinkController overrides
-  virtual void LinkActivated(ChromeViews::Link* source, int event_flags);
+  virtual void LinkActivated(views::Link* source, int event_flags);
 
   // NativeButton Listener overrides.
-  virtual void ButtonPressed(ChromeViews::NativeButton* sender);
+  virtual void ButtonPressed(views::NativeButton* sender);
 
   // Used to set our model temporarily during layout and paint operations
   void SetModel(DownloadItem* model, DownloadTabView* parent);
@@ -66,31 +66,31 @@ private:
   bool is_floating_view_renderer_;
 
   // Time display.
-  ChromeViews::Label* since_;
-  ChromeViews::Label* date_;
+  views::Label* since_;
+  views::Label* date_;
 
   // The name of the file. Clicking this link will open the download.
-  ChromeViews::Link* file_name_;
+  views::Link* file_name_;
 
   // The name of the downloaded URL.
-  ChromeViews::Label* download_url_;
+  views::Label* download_url_;
 
   // The current status of the download.
-  ChromeViews::Label* time_remaining_;
-  ChromeViews::Label* download_progress_;
+  views::Label* time_remaining_;
+  views::Label* download_progress_;
 
   // The message warning of a dangerous download.
-  ChromeViews::Label* dangerous_download_warning_;
+  views::Label* dangerous_download_warning_;
 
   // Actions that can be initiated.
-  ChromeViews::Link* pause_;
-  ChromeViews::Link* cancel_;
-  ChromeViews::Link* show_;
+  views::Link* pause_;
+  views::Link* cancel_;
+  views::Link* show_;
 
   // The buttons used to prompt the user when a dangerous download has been
   // initiated.
-  ChromeViews::NativeButton* save_button_;
-  ChromeViews::NativeButton* discard_button_;
+  views::NativeButton* save_button_;
+  views::NativeButton* discard_button_;
 
   DISALLOW_EVIL_CONSTRUCTORS(DownloadItemTabView);
 };
@@ -98,7 +98,7 @@ private:
 
 // A view that manages each of the individual download views
 // (DownloadItemTabView) in the destination tab.
-class DownloadTabView : public ChromeViews::View,
+class DownloadTabView : public views::View,
                         public DownloadItem::Observer,
                         public DownloadManager::Observer {
  public:
@@ -114,9 +114,9 @@ class DownloadTabView : public ChromeViews::View,
   virtual void Paint(ChromeCanvas* canvas);
   virtual bool GetFloatingViewIDForPoint(int x, int y, int* id);
   virtual bool EnumerateFloatingViews(
-      ChromeViews::View::FloatingViewPosition position,
+      views::View::FloatingViewPosition position,
       int starting_id, int* id);
-  virtual ChromeViews::View* ValidateFloatingViewForID(int id);
+  virtual views::View* ValidateFloatingViewForID(int id);
 
   // DownloadItem::Observer interface
   virtual void OnDownloadUpdated(DownloadItem* download);
@@ -142,9 +142,9 @@ class DownloadTabView : public ChromeViews::View,
   // Determine if we should draw the date beside a particular download
   bool ShouldDrawDateForDownload(DownloadItem* download);
 
-  virtual int GetPageScrollIncrement(ChromeViews::ScrollView* scroll_view,
+  virtual int GetPageScrollIncrement(views::ScrollView* scroll_view,
                                      bool is_horizontal, bool is_positive);
-  virtual int GetLineScrollIncrement(ChromeViews::ScrollView* scroll_view,
+  virtual int GetLineScrollIncrement(views::ScrollView* scroll_view,
                                      bool is_horizontal, bool is_positive);
 
   int start_angle() const { return start_angle_; }
@@ -159,7 +159,7 @@ class DownloadTabView : public ChromeViews::View,
 
  private:
   // Creates and attaches to the view the floating view at |index|.
-  ChromeViews::View* CreateFloatingViewForIndex(int index);
+  views::View* CreateFloatingViewForIndex(int index);
 
   // Utility functions for operating on DownloadItemTabViews by index.
   void SchedulePaintForViewAtIndex(int index);
@@ -203,7 +203,7 @@ class DownloadTabView : public ChromeViews::View,
   // Provide a start position for downloads with no known size.
   int start_angle_;
 
-  ChromeViews::FixedRowHeightScrollHelper scroll_helper_;
+  views::FixedRowHeightScrollHelper scroll_helper_;
 
   // Keep track of the currently selected view, so that we can inform it when
   // the user changes the selection.
@@ -234,7 +234,7 @@ class DownloadTabUI : public NativeUI,
   virtual const int GetFavIconID() const;
   virtual const int GetSectionIconID() const;
   virtual const std::wstring GetSearchButtonText() const;
-  virtual ChromeViews::View* GetView();
+  virtual views::View* GetView();
   virtual void WillBecomeVisible(NativeUIContents* parent);
   virtual void WillBecomeInvisible(NativeUIContents* parent);
   virtual void Navigate(const PageState& state);