2 files changed, 27 insertions, 18 deletions

diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index fc9fb4c..3320a58 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -23,6 +23,7 @@
 #include "ui/gfx/font.h"
 #include "views/controls/button/native_button.h"
 #include "views/layout/layout_constants.h"
+#include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
@@ -256,9 +257,10 @@ void DialogClientView::SetBottomView(View* bottom_view) {
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, View overrides:
 
-void DialogClientView::NativeViewHierarchyChanged(bool attached,
-                                                  gfx::NativeView native_view,
-                                                  RootView* root_view) {
+void DialogClientView::NativeViewHierarchyChanged(
+    bool attached,
+    gfx::NativeView native_view,
+    internal::RootView* root_view) {
   if (attached) {
     UpdateFocusListener();
   }
diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h
index 06a2d73..4a3155a 100644
--- a/views/window/dialog_client_view.h
+++ b/views/window/dialog_client_view.h
@@ -16,6 +16,9 @@ namespace views {
 class DialogDelegate;
 class NativeButton;
 class Window;
+namespace internal {
+class RootView;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView
@@ -60,30 +63,34 @@ class DialogClientView : public ClientView,
   void SetBottomView(View* bottom_view);
 
   // Overridden from View:
-  virtual void NativeViewHierarchyChanged(bool attached,
-                                          gfx::NativeView native_view,
-                                          RootView* root_view);
+  virtual void NativeViewHierarchyChanged(
+      bool attached,
+      gfx::NativeView native_view,
+      internal::RootView* root_view) OVERRIDE;
 
   // Overridden from ClientView:
-  virtual bool CanClose();
-  virtual void WindowClosing();
-  virtual int NonClientHitTest(const gfx::Point& point);
-  virtual DialogClientView* AsDialogClientView();
+  virtual bool CanClose() OVERRIDE;
+  virtual void WindowClosing() OVERRIDE;
+  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
+  virtual DialogClientView* AsDialogClientView() OVERRIDE;
 
   // FocusChangeListener implementation:
-  virtual void FocusWillChange(View* focused_before, View* focused_now);
+  virtual void FocusWillChange(View* focused_before,
+                               View* focused_now) OVERRIDE;
 
  protected:
   // View overrides:
-  virtual void OnPaint(gfx::Canvas* canvas);
-  virtual void PaintChildren(gfx::Canvas* canvas);
-  virtual void Layout();
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
-  virtual gfx::Size GetPreferredSize();
-  virtual bool AcceleratorPressed(const Accelerator& accelerator);
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void ViewHierarchyChanged(bool is_add, View* parent,
+                                    View* child) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;
 
   // ButtonListener implementation:
-  virtual void ButtonPressed(Button* sender, const views::Event& event);
+  virtual void ButtonPressed(Button* sender,
+                             const views::Event& event) OVERRIDE;
 
  private:
   // Paint the size box in the bottom right corner of the window if it is