1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc
index ef5e3b7..f45731f 100644
--- a/chrome/views/custom_frame_window.cc
+++ b/chrome/views/custom_frame_window.cc
@@ -23,7 +23,7 @@
 #include "chrome/views/window_resources.h"
 #include "generated_resources.h"
 
-namespace ChromeViews {
+namespace views {
 
 // A scoping class that removes the WS_VISIBLE style of a window.
 //
@@ -795,7 +795,7 @@ void DefaultNonClientView::LayoutTitleBar() {
         title_font_.height());
 
     // We draw the custom frame window's title directly rather than using a
-    // ChromeViews::Label child view. Therefore, we have to mirror the title
+    // views::Label child view. Therefore, we have to mirror the title
     // position manually if the View's UI layout is right-to-left. Child Views
     // are automatically mirrored, which means that the parent view doesn't
     // need to manually modify their position depending on the View's UI
@@ -837,7 +837,7 @@ void DefaultNonClientView::InitClass() {
 ///////////////////////////////////////////////////////////////////////////////
 // NonClientViewLayout
 
-class NonClientViewLayout : public ChromeViews::LayoutManager {
+class NonClientViewLayout : public LayoutManager {
  public:
   // The size of the default window border and padding used by Windows Vista
   // with DWM disabled when clipping the window for maximized display.
@@ -845,15 +845,14 @@ class NonClientViewLayout : public ChromeViews::LayoutManager {
   //             with adjustments to the Windows Border/Padding setting.
   static const int kBorderAndPadding = 8;
 
-  NonClientViewLayout(ChromeViews::View* child,
-                      ChromeViews::Window* window)
+  NonClientViewLayout(View* child, Window* window)
       : child_(child),
         window_(window) {
   }
   virtual ~NonClientViewLayout() {}
 
-  // Overridden from ChromeViews::LayoutManager:
-  virtual void Layout(ChromeViews::View* host) {
+  // Overridden from LayoutManager:
+  virtual void Layout(View* host) {
     int horizontal_border_width =
         window_->IsMaximized() ? kBorderAndPadding : 0;
     int vertical_border_height =
@@ -863,13 +862,13 @@ class NonClientViewLayout : public ChromeViews::LayoutManager {
                       host->width() - (2 * horizontal_border_width),
                       host->height() - (2 * vertical_border_height));
   }
-  virtual gfx::Size GetPreferredSize(ChromeViews::View* host) {
+  virtual gfx::Size GetPreferredSize(View* host) {
     return child_->GetPreferredSize();
   }
 
  private:
-  ChromeViews::View* child_;
-  ChromeViews::Window* window_;
+  View* child_;
+  Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientViewLayout);
 };
@@ -1319,5 +1318,5 @@ void CustomFrameWindow::ResetWindowRegion() {
   DeleteObject(current_rgn);
 }
 
-}  // namespace ChromeViews
+}  // namespace views