Move wm/public into wm target

content/shell/browser/shell_views.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 "content/shell/browser/shell.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 21 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
-#include "ui/wm/test/wm_test_helper.h"
+#include "ui/aura/window_observer.h"
+#include "ui/aura/window_tree_host.h"
+#include "ui/wm/core/compound_event_filter.h"
+#include "ui/wm/core/input_method_event_filter.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 #endif
 
 namespace content {
 
 namespace {
 // ViewDelegate implementation for aura content shell
 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
  public:
   ShellViewsDelegateAura() : use_transparent_windows_(false) {
   }
 
   virtual ~ShellViewsDelegateAura() {
   }
 
   void SetUseTransparentWindows(bool transparent) {
     use_transparent_windows_ = transparent;
   }
 
  private:
   bool use_transparent_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura);
 };
 
+#if defined(OS_CHROMEOS)
+class ShellWindowTreeClient : public aura::client::WindowTreeClient,
+                              public aura::WindowObserver {
+ public:
+  ShellWindowTreeClient(aura::WindowTreeHost* host) : host_(host) {
+    host_->window()->AddObserver(this);
+    aura::client::SetWindowTreeClient(host_->window(), this);
+    input_method_filter_.reset(
+        new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
+    input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
+  }
+  virtual ~ShellWindowTreeClient() {
+    host_->window()->RemoveObserver(this);
+  }
+
+ private:
+  // Overridden from aura::client::WindowTreeClient:
+  virtual aura::Window* GetDefaultParent(
+      aura::Window* context,
+      aura::Window* window,
+      const gfx::Rect& bounds) OVERRIDE {
+    return host_->window();
+  }
+
+  // Overridden from aura::WindowObserver:
+  virtual void OnWindowDestroyed(aura::Window* window) {
+    DCHECK_EQ(window, host_->window());
+    delete this;
+  }
+
+  aura::WindowTreeHost* host_;
+  wm::CompoundEventFilter* root_window_event_filter_;
+  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+  scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
+  scoped_ptr<wm::DefaultActivationClient> activation_client_;
+  scoped_ptr<aura::client::FocusClient> focus_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShellWindowTreeClient);
+};
+#endif  // OS_CHROMEOS
+
 // Model for the "Debug" menu
 class ContextMenuModel : public ui::SimpleMenuModel,
                          public ui::SimpleMenuModel::Delegate {
  public:
   explicit ContextMenuModel(
       Shell* shell, const content::ContextMenuParams& params)
     : ui::SimpleMenuModel(this),
       shell_(shell),
       params_(params) {
     AddItem(COMMAND_OPEN_DEVTOOLS, base::ASCIIToUTF16("Inspect Element"));
@@ skipping 318 matching lines @@
   // Contents view contains the web contents view
   View* contents_view_;
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
 };
 
 }  // namespace
 
 #if defined(OS_CHROMEOS)
-wm::WMTestHelper* Shell::wm_test_helper_ = NULL;
+aura::WindowTreeHost* Shell::shell_host_ = NULL;
 #endif
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
 #if defined(OS_WIN)
   _setmode(_fileno(stdout), _O_BINARY);
   _setmode(_fileno(stderr), _O_BINARY);
 #endif
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
-  wm_test_helper_ = new wm::WMTestHelper(default_window_size);
+  aura::Env::CreateInstance();
+  shell_host_ = aura::WindowTreeHost::Create(gfx::Rect(0, 0, 800, 600));
+  new ShellWindowTreeClient(shell_host_);  // Deletes itself when host dies.
 #else
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 #endif
   views_delegate_ = new ShellViewsDelegateAura();
 }
 
 void Shell::PlatformExit() {
 #if defined(OS_CHROMEOS)
-  delete wm_test_helper_;
+  delete shell_host_;
+  aura::Env::DeleteInstance();
 #endif
   delete views_delegate_;
   views_delegate_ = NULL;
   delete platform_;
   platform_ = NULL;
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Shutdown();
 #endif
   aura::Env::DeleteInstance();
 }
@@ skipping 34 matching lines @@
     content_size_ = gfx::Size(width, height);
     if (!platform_)
       platform_ = new ShellPlatformDataAura(content_size_);
     else
       platform_->ResizeWindow(content_size_);
     return;
   }
 #if defined(OS_CHROMEOS)
   window_widget_ = views::Widget::CreateWindowWithContextAndBounds(
       new ShellWindowDelegateView(this),
-      wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()),
+      shell_host_->window(),
       gfx::Rect(0, 0, width, height));
 #else
   window_widget_ = new views::Widget;
   views::Widget::InitParams params;
   params.bounds = gfx::Rect(0, 0, width, height);
   params.delegate = new ShellWindowDelegateView(this);
   params.top_level = true;
   params.remove_standard_frame = true;
   window_widget_->Init(params);
 #endif
@@ skipping 59 matching lines @@
 
 void Shell::PlatformWebContentsFocused(WebContents* contents) {
   if (headless_)
     return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->OnWebContentsFocused(contents);
 }
 
 }  // namespace content