Revert 266616 "Move DefaultActivationClient to wm/core"

trunk/src/mojo/examples/launcher/launcher.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 <stdio.h>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "mojo/examples/aura_demo/demo_screen.h"
 #include "mojo/examples/aura_demo/window_tree_host_mojo.h"
 #include "mojo/examples/launcher/launcher.mojom.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/bindings/remote_ptr.h"
 #include "mojo/public/cpp/gles2/gles2.h"
 #include "mojo/public/cpp/shell/application.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "url/gurl.h"
 
 #if defined(WIN32)
 #if !defined(CDECL)
 #define CDECL __cdecl
 #endif
 #define LAUNCHER_EXPORT __declspec(dllexport)
 #else
 #define CDECL
 #define LAUNCHER_EXPORT __attribute__((visibility("default")))
@@ skipping 179 matching lines @@
     launcher_client_->OnURLEntered(url_text);
   }
 
   void HostContextCreated() {
     window_tree_host_->InitHost();
     window_tree_host_->window()->SetBounds(gfx::Rect(450, 60));
 
     focus_client_.reset(new aura::test::TestFocusClient());
     aura::client::SetFocusClient(window_tree_host_->window(),
                                  focus_client_.get());
-    new wm::DefaultActivationClient(window_tree_host_->window());
+    activation_client_.reset(
+        new aura::client::DefaultActivationClient(window_tree_host_->window()));
     capture_client_.reset(
         new aura::client::DefaultCaptureClient(window_tree_host_->window()));
     ime_filter_.reset(new MinimalInputEventFilter(window_tree_host_->window()));
 
     window_tree_client_.reset(
         new LauncherWindowTreeClient(window_tree_host_->window()));
 
     launcher_controller_.InitInWindow(window_tree_host_->window());
 
     if (pending_show_) {
       pending_show_ = false;
       Show();
     }
   }
 
   scoped_ptr<DemoScreen> screen_;
   scoped_ptr<LauncherWindowTreeClient> window_tree_client_;
+  scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::EventHandler> ime_filter_;
 
   LauncherController launcher_controller_;
 
   RemotePtr<LauncherClient> launcher_client_;
   scoped_ptr<aura::WindowTreeHost> window_tree_host_;
 
   bool pending_show_;
@@ skipping 19 matching lines @@
 
   // TODO(beng): This crashes in a DCHECK on X11 because this thread's
   //             MessageLoop is not of TYPE_UI. I think we need a way to build
   //             Aura that doesn't define platform-specific stuff.
   aura::Env::CreateInstance();
   mojo::examples::LauncherImpl launcher(shell_handle);
   loop.Run();
 
   return MOJO_RESULT_OK;
 }