Shell related switches -> aura shell switches.

ui/aura_shell/default_container_layout_manager_unittest.cc

 // Copyright (c) 2011 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 "ui/aura_shell/default_container_layout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 29 matching lines @@
         new aura_shell::internal::WorkspaceController(container_.get()));
     layout_manager_ = new DefaultContainerLayoutManager(
         workspace_controller_->workspace_manager());
     container_->SetLayoutManager(layout_manager_);
 
     root_window->SetHostSize(gfx::Size(500, 400));
   }
 
   aura::Window* CreateTestWindowWithType(const gfx::Rect& bounds,
                                          aura::Window* parent,
-                                         aura::WindowType type) {
+                                         aura::client::WindowType type) {
     aura::Window* window = new aura::Window(NULL);
     window->SetType(type);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     window->SetBounds(bounds);
     window->Show();
     window->SetParent(parent);
     return window;
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds,
                                  aura::Window* parent) {
     return CreateTestWindowWithType(bounds,
                                     parent,
-                                    aura::WINDOW_TYPE_NORMAL);
+                                    aura::client::WINDOW_TYPE_NORMAL);
   }
 
   aura::Window* container() { return container_.get(); }
 
   DefaultContainerLayoutManager* default_container_layout_manager() {
     return layout_manager_;
   }
 
  protected:
   aura_shell::internal::WorkspaceManager* workspace_manager() {
     return workspace_controller_->workspace_manager();
   }
 
  private:
   scoped_ptr<aura::Window> container_;
   scoped_ptr<aura_shell::internal::WorkspaceController> workspace_controller_;
   // LayoutManager is owned by |container|.
   aura_shell::internal::DefaultContainerLayoutManager* layout_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManagerTest);
 };
 
 // Utility functions to set and get show state on |window|.
 void Maximize(aura::Window* window) {
-  window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
+  window->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
 void Fullscreen(aura::Window* window) {
-  window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+  window->SetIntProperty(aura::client::kShowStateKey,
+                         ui::SHOW_STATE_FULLSCREEN);
 }
 
 void Restore(aura::Window* window) {
-  window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
+  window->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
 }
 
 ui::WindowShowState GetShowState(aura::Window* window) {
   return static_cast<ui::WindowShowState>(
-      window->GetIntProperty(aura::kShowStateKey));
+      window->GetIntProperty(aura::client::kShowStateKey));
 }
 
 }  // namespace
 
 TEST_F(DefaultContainerLayoutManagerTest, SetBounds) {
   // Layout Manager moves the window to (0,0) to fit to draggable area.
   scoped_ptr<aura::Window> child(
       CreateTestWindow(gfx::Rect(0, -1000, 100, 100), container()));
   // Window is centered in workspace.
   EXPECT_EQ("200,0 100x100", child->bounds().ToString());
@@ skipping 26 matching lines @@
   child->SetBounds(gfx::Rect(1000, 500, 50, 50));
   EXPECT_EQ("450,0 50x50", child->GetTargetBounds().ToString());
   default_container_layout_manager()->EndMove(child.get(), NULL);
   EXPECT_EQ(original_bounds.ToString(), child->GetTargetBounds().ToString());
 }
 
 TEST_F(DefaultContainerLayoutManagerTest, Popup) {
   scoped_ptr<aura::Window> popup(
       CreateTestWindowWithType(gfx::Rect(0, -1000, 100, 100),
                                container(),
-                               aura::WINDOW_TYPE_POPUP));
+                               aura::client::WINDOW_TYPE_POPUP));
   // A popup window can be placed outside of draggable area.
   EXPECT_EQ("0,-1000 100x100", popup->bounds().ToString());
 
   // A popup window can be moved to outside of draggable area.
   popup->SetBounds(gfx::Rect(-100, 0, 100, 100));
   EXPECT_EQ("-100,0 100x100", popup->bounds().ToString());
 
   // A popup window can be resized to the size bigger than draggable area.
   popup->SetBounds(gfx::Rect(0, 0, 1000, 1000));
   EXPECT_EQ("0,0 1000x1000", popup->bounds().ToString());
 }
 
 // Make sure a window with a transient parent isn't resized by the layout
 // manager.
 TEST_F(DefaultContainerLayoutManagerTest, IgnoreTransient) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
-  window->SetType(aura::WINDOW_TYPE_NORMAL);
+  window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   aura::RootWindow::GetInstance()->AddTransientChild(window.get());
   window->SetBounds(gfx::Rect(0, 0, 200, 200));
   window->Show();
   window->SetParent(container());
 
   EXPECT_EQ("0,0 200x200", window->bounds().ToString());
 }
 
 TEST_F(DefaultContainerLayoutManagerTest, Fullscreen) {
   scoped_ptr<aura::Window> w(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100), container()));
   gfx::Rect fullscreen_bounds =
       workspace_manager()->FindBy(w.get())->bounds();
   gfx::Rect original_bounds = w->GetTargetBounds();
 
   // Restoreing the restored window.
   Restore(w.get());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, GetShowState(w.get()));
   EXPECT_EQ(original_bounds.ToString(), w->bounds().ToString());
 
   // Fullscreen
   Fullscreen(w.get());
   EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN, GetShowState(w.get()));
   EXPECT_EQ(fullscreen_bounds.ToString(), w->bounds().ToString());
-  w->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
+  w->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, GetShowState(w.get()));
   EXPECT_EQ(original_bounds.ToString(), w->bounds().ToString());
 
   Fullscreen(w.get());
   // Setting |ui::SHOW_STATE_FULLSCREEN| should have no additional effect.
   Fullscreen(w.get());
   EXPECT_EQ(fullscreen_bounds, w->bounds());
   Restore(w.get());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, GetShowState(w.get()));
   EXPECT_EQ(original_bounds.ToString(), w->bounds().ToString());
@@ skipping 127 matching lines @@
 
   Restore(w1.get());
   // The following test does not pass due to crbug.com/102413.
   // TODO(oshima): Re-enable this once the bug is fixed.
   // EXPECT_EQ(window_bounds.size().ToString(),
   //           w1->GetTargetBounds().size().ToString());
 }
 
 }  // namespace test
 }  // namespace aura_shell