wm: public window_types.

ash/wm/workspace_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace_controller.h"
 
 #include <map>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
@@ skipping 67 matching lines @@
 }
 
 class WorkspaceControllerTest : public test::AshTestBase {
  public:
   WorkspaceControllerTest() {}
   virtual ~WorkspaceControllerTest() {}
 
   aura::Window* CreateTestWindowUnparented() {
     aura::Window* window = new aura::Window(NULL);
     window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
-    window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     return window;
   }
 
   aura::Window* CreateTestWindow() {
     aura::Window* window = new aura::Window(NULL);
     window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
-    window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     ParentWindowInPrimaryRootWindow(window);
     return window;
   }
 
   aura::Window* CreateBrowserLikeWindow(const gfx::Rect& bounds) {
     aura::Window* window = CreateTestWindow();
     window->SetBounds(bounds);
     wm::WindowState* window_state = wm::GetWindowState(window);
     window_state->set_window_position_managed(true);
@@ skipping 1000 matching lines @@
             ",32 640x320", window1->bounds().ToString());
   EXPECT_EQ("0,48 256x512", window2->bounds().ToString());
 }
 
 // This tests simulates a browser and an app and verifies the ordering of the
 // windows and layers doesn't get out of sync as various operations occur. Its
 // really testing code in FocusController, but easier to simulate here. Just as
 // with a real browser the browser here has a transient child window
 // (corresponds to the status bubble).
 TEST_F(WorkspaceControllerTest, VerifyLayerOrdering) {
-  scoped_ptr<Window> browser(
-      aura::test::CreateTestWindowWithDelegate(
-          NULL,
-          aura::client::WINDOW_TYPE_NORMAL,
-          gfx::Rect(5, 6, 7, 8),
-          NULL));
+  scoped_ptr<Window> browser(aura::test::CreateTestWindowWithDelegate(
+      NULL, ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(5, 6, 7, 8), NULL));
   browser->SetName("browser");
   ParentWindowInPrimaryRootWindow(browser.get());
   browser->Show();
   wm::ActivateWindow(browser.get());
 
   // |status_bubble| is made a transient child of |browser| and as a result
   // owned by |browser|.
   aura::test::TestWindowDelegate* status_bubble_delegate =
       aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate();
   status_bubble_delegate->set_can_focus(false);
   Window* status_bubble =
-      aura::test::CreateTestWindowWithDelegate(
-          status_bubble_delegate,
-          aura::client::WINDOW_TYPE_POPUP,
-          gfx::Rect(5, 6, 7, 8),
-          NULL);
+      aura::test::CreateTestWindowWithDelegate(status_bubble_delegate,
+                                               ui::wm::WINDOW_TYPE_POPUP,
+                                               gfx::Rect(5, 6, 7, 8),
+                                               NULL);
   browser->AddTransientChild(status_bubble);
   ParentWindowInPrimaryRootWindow(status_bubble);
   status_bubble->SetName("status_bubble");
 
-  scoped_ptr<Window> app(
-      aura::test::CreateTestWindowWithDelegate(
-          NULL,
-          aura::client::WINDOW_TYPE_NORMAL,
-          gfx::Rect(5, 6, 7, 8),
-          NULL));
+  scoped_ptr<Window> app(aura::test::CreateTestWindowWithDelegate(
+      NULL, ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(5, 6, 7, 8), NULL));
   app->SetName("app");
   ParentWindowInPrimaryRootWindow(app.get());
 
   aura::Window* parent = browser->parent();
 
   app->Show();
   wm::ActivateWindow(app.get());
   EXPECT_EQ(GetWindowNames(parent), GetLayerNames(parent));
 
   // Minimize the app, focus should go the browser.
@@ skipping 115 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestDragging);
 };
 
 }  // namespace
 
 // Verifies that when dragging a window over the shelf overlap is detected
 // during and after the drag.
 TEST_P(WorkspaceControllerTestDragging, DragWindowOverlapShelf) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
-  scoped_ptr<Window> w1(
-      aura::test::CreateTestWindowWithDelegate(&delegate,
-                                               aura::client::WINDOW_TYPE_NORMAL,
-                                               gfx::Rect(5, 5, 100, 50),
-                                               NULL));
+  scoped_ptr<Window> w1(aura::test::CreateTestWindowWithDelegate(
+      &delegate, ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(5, 5, 100, 50), NULL));
   ParentWindowInPrimaryRootWindow(w1.get());
 
   ShelfLayoutManager* shelf = shelf_layout_manager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
 
   // Drag near the shelf
   aura::test::EventGenerator generator(
       Shell::GetPrimaryRootWindow(), gfx::Point());
   generator.MoveMouseTo(10, 10);
   generator.PressLeftButton();
   generator.MoveMouseTo(100, shelf->GetIdealBounds().y() - 70);
 
   // Shelf should not be in overlapped state.
   EXPECT_FALSE(GetWindowOverlapsShelf());
 
   generator.MoveMouseTo(100, shelf->GetIdealBounds().y() - 20);
 
   // Shelf should detect overlap. Overlap state stays after mouse is released.
   EXPECT_TRUE(GetWindowOverlapsShelf());
   generator.ReleaseLeftButton();
   EXPECT_TRUE(GetWindowOverlapsShelf());
 }
 
 INSTANTIATE_TEST_CASE_P(DockedOrNot, WorkspaceControllerTestDragging,
                         ::testing::Bool());
 
 }  // namespace internal
 }  // namespace ash