From 5b251f10c00377eb437bf11d52128ff7f359a5e3 Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
 <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 19 Dec 2013 01:50:05 +0000
Subject: wm: public window_types.

Patch manually generated by:

$ git grep -l aura::client::WINDOW_TYPE | xargs sed -i -e 's/aura::client::WINDOW_TYPE/ui::wm::WINDOW_TYPE/g'
$ git commit -a -m.
$ git clang-format HEAD^ --style=Chromium
$ git commit -a -m.

* Move window_types.h header from ui/aura/client/ to ui/wm/public/

BUG=319638
TEST=ash_unittests, aura_unittests, views_unittests, unit_tests
R=ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241752 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/test/ash_test_base.cc            | 7 ++-----
 ash/test/ash_test_base.h             | 4 ++--
 ash/test/test_shelf_delegate.cc      | 2 +-
 ash/test/test_shelf_item_delegate.cc | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'ash/test')

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 30ca1be..2326900 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -241,15 +241,12 @@ aura::Window* AshTestBase::CreateTestWindowInShellWithDelegate(
     int id,
     const gfx::Rect& bounds) {
   return CreateTestWindowInShellWithDelegateAndType(
-      delegate,
-      aura::client::WINDOW_TYPE_NORMAL,
-      id,
-      bounds);
+      delegate, ui::wm::WINDOW_TYPE_NORMAL, id, bounds);
 }
 
 aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType(
     aura::WindowDelegate* delegate,
-    aura::client::WindowType type,
+    ui::wm::WindowType type,
     int id,
     const gfx::Rect& bounds) {
   aura::Window* window = new aura::Window(delegate);
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index acb7d46..e606bab 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -13,8 +13,8 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/aura/client/window_types.h"
 #include "ui/views/test/test_views_delegate.h"
+#include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
@@ -83,7 +83,7 @@ class AshTestBase : public testing::Test {
       const gfx::Rect& bounds);
   aura::Window* CreateTestWindowInShellWithDelegateAndType(
       aura::WindowDelegate* delegate,
-      aura::client::WindowType type,
+      ui::wm::WindowType type,
       int id,
       const gfx::Rect& bounds);
 
diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc
index c880d24..1a62cff 100644
--- a/ash/test/test_shelf_delegate.cc
+++ b/ash/test/test_shelf_delegate.cc
@@ -36,7 +36,7 @@ void TestShelfDelegate::AddLauncherItem(aura::Window* window) {
 void TestShelfDelegate::AddLauncherItem(aura::Window* window,
                                         LauncherItemStatus status) {
   LauncherItem item;
-  if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+  if (window->type() == ui::wm::WINDOW_TYPE_PANEL)
     item.type = TYPE_APP_PANEL;
   else
     item.type = TYPE_PLATFORM_APP;
diff --git a/ash/test/test_shelf_item_delegate.cc b/ash/test/test_shelf_item_delegate.cc
index b09d9d7..ed87531 100644
--- a/ash/test/test_shelf_item_delegate.cc
+++ b/ash/test/test_shelf_item_delegate.cc
@@ -19,7 +19,7 @@ TestShelfItemDelegate::~TestShelfItemDelegate() {
 
 bool TestShelfItemDelegate::ItemSelected(const ui::Event& event) {
   if (window_) {
-    if (window_->type() == aura::client::WINDOW_TYPE_PANEL)
+    if (window_->type() == ui::wm::WINDOW_TYPE_PANEL)
       wm::MoveWindowToEventRoot(window_, event);
     window_->Show();
     wm::ActivateWindow(window_);
-- 
cgit v1.1