Add namespace to constrained_window component

BUG=None
TBR=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/705303002

Cr-Commit-Position: refs/heads/master@{#303523}

4 files changed, 23 insertions, 7 deletions

diff --git a/components/constrained_window/constrained_window_views.cc b/components/constrained_window/constrained_window_views.cc
index a95b027..dd4ada8 100644
--- a/components/constrained_window/constrained_window_views.cc
+++ b/components/constrained_window/constrained_window_views.cc
@@ -17,6 +17,7 @@
 using web_modal::ModalDialogHost;
 using web_modal::ModalDialogHostObserver;
 
+namespace constrained_window {
 namespace {
 
 ConstrainedWindowViewsClient* constrained_window_views_client = NULL;
@@ -173,3 +174,5 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
   }
   return widget;
 }
+
+}  // namespace constrained window
diff --git a/components/constrained_window/constrained_window_views.h b/components/constrained_window/constrained_window_views.h
index f435950..ed4a828 100644
--- a/components/constrained_window/constrained_window_views.h
+++ b/components/constrained_window/constrained_window_views.h
@@ -23,6 +23,8 @@ class ModalDialogHost;
 class WebContentsModalDialogHost;
 }
 
+namespace constrained_window {
+
 class ConstrainedWindowViewsClient;
 
 // Sets the ConstrainedWindowClient impl.
@@ -56,4 +58,6 @@ views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
 views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
                                              gfx::NativeView parent);
 
+}  // namespace constrained window
+
 #endif  // COMPONENTS_CONSTRAINED_WINDOW_CONSTRAINED_WINDOW_VIEWS_H_
diff --git a/components/constrained_window/constrained_window_views_client.h b/components/constrained_window/constrained_window_views_client.h
index 65cd132..d0ec33c 100644
--- a/components/constrained_window/constrained_window_views_client.h
+++ b/components/constrained_window/constrained_window_views_client.h
@@ -15,6 +15,8 @@ namespace web_modal {
 class ModalDialogHost;
 }
 
+namespace constrained_window {
+
 class ConstrainedWindowViewsClient {
  public:
   virtual ~ConstrainedWindowViewsClient() {}
@@ -29,4 +31,6 @@ class ConstrainedWindowViewsClient {
       gfx::NativeView parent) = 0;
 };
 
+}  // namespace constrained window
+
 #endif  // COMPONENTS_CONSTRAINED_WINDOW_CONSTRAINED_WINDOW_VIEWS_CLIENT_H_
diff --git a/components/constrained_window/constrained_window_views_unittest.cc b/components/constrained_window/constrained_window_views_unittest.cc
index d163c43..d3e036b 100644
--- a/components/constrained_window/constrained_window_views_unittest.cc
+++ b/components/constrained_window/constrained_window_views_unittest.cc
@@ -14,9 +14,12 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
-namespace views {
+using views::Widget;
 
-class DialogContents : public DialogDelegateView {
+namespace constrained_window {
+namespace {
+
+class DialogContents : public views::DialogDelegateView {
  public:
   DialogContents() {}
   ~DialogContents() override {}
@@ -26,7 +29,7 @@ class DialogContents : public DialogDelegateView {
   }
 
   // Overriden from DialogDelegateView:
-  View* GetContentsView() override { return this; }
+  views::View* GetContentsView() override { return this; }
   gfx::Size GetPreferredSize() const override { return preferred_size_; }
   gfx::Size GetMinimumSize() const override { return gfx::Size(); }
 
@@ -36,13 +39,13 @@ class DialogContents : public DialogDelegateView {
   DISALLOW_COPY_AND_ASSIGN(DialogContents);
 };
 
-class ConstrainedWindowViewsTest : public ViewsTestBase {
+class ConstrainedWindowViewsTest : public views::ViewsTestBase {
  public:
   ConstrainedWindowViewsTest() : contents_(NULL) {}
   ~ConstrainedWindowViewsTest() override {}
 
   void SetUp() override {
-    ViewsTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
     contents_ = new DialogContents;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ -85,6 +88,8 @@ class ConstrainedWindowViewsTest : public ViewsTestBase {
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViewsTest);
 };
 
+}  // namespace
+
 // Make sure a dialog that increases its preferred size grows on the next
 // position update.
 TEST_F(ConstrainedWindowViewsTest, GrowModalDialogSize) {
@@ -136,7 +141,7 @@ TEST_F(ConstrainedWindowViewsTest, MaximumWebContentsDialogSize) {
   // specified by the dialog host, so add it to the size the dialog is expected
   // to occupy.
   gfx::Size expected_size = max_dialog_size;
-  Border* border = dialog()->non_client_view()->frame_view()->border();
+  views::Border* border = dialog()->non_client_view()->frame_view()->border();
   if (border)
     expected_size.Enlarge(0, border->GetInsets().top());
   EXPECT_EQ(expected_size.ToString(), GetDialogSize().ToString());
@@ -149,4 +154,4 @@ TEST_F(ConstrainedWindowViewsTest, MaximumWebContentsDialogSize) {
   EXPECT_EQ(full_dialog_size.ToString(), GetDialogSize().ToString());
 }
 
-}  // namespace views
+}  // namespace constrained_window