Move ui\aura\shared to ui\views\corewm

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 54 matching lines @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
-#include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
+#include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
@@ skipping 62 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell::TestApi
 
 Shell::TestApi::TestApi(Shell* shell) : shell_(shell) {}
 
 internal::RootWindowLayoutManager* Shell::TestApi::root_window_layout() {
   return shell_->GetPrimaryRootWindowController()->root_window_layout();
 }
 
-aura::shared::InputMethodEventFilter*
+views::corewm::InputMethodEventFilter*
     Shell::TestApi::input_method_event_filter() {
   return shell_->input_method_filter_.get();
 }
 
 internal::SystemGestureEventFilter*
     Shell::TestApi::system_gesture_event_filter() {
   return shell_->system_gesture_filter_.get();
 }
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
@@ skipping 202 matching lines @@
 bool Shell::IsLauncherPerDisplayEnabled() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kAshLauncherPerDisplay);
 }
 
 void Shell::Init() {
   // Install the custom factory first so that views::FocusManagers for Tray,
   // Launcher, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
-  env_filter_.reset(new aura::shared::CompoundEventFilter);
+  env_filter_.reset(new views::corewm::CompoundEventFilter);
   AddEnvEventFilter(env_filter_.get());
 
   focus_manager_.reset(new aura::FocusManager);
   activation_controller_.reset(
       new internal::ActivationController(focus_manager_.get()));
 
   focus_cycler_.reset(new internal::FocusCycler());
 
   screen_position_controller_.reset(new internal::ScreenPositionController);
   display_controller_.reset(new DisplayController);
@@ skipping 13 matching lines @@
   user_activity_detector_.reset(new UserActivityDetector);
   AddEnvEventFilter(user_activity_detector_.get());
 
   event_rewriter_filter_.reset(new internal::EventRewriterEventFilter);
   AddEnvEventFilter(event_rewriter_filter_.get());
 
   overlay_filter_.reset(new internal::OverlayEventFilter);
   AddEnvEventFilter(overlay_filter_.get());
   AddShellObserver(overlay_filter_.get());
 
-  input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
+  input_method_filter_.reset(new views::corewm::InputMethodEventFilter);
   AddEnvEventFilter(input_method_filter_.get());
 
 #if !defined(OS_MACOSX)
   accelerator_filter_.reset(new internal::AcceleratorFilter);
   AddEnvEventFilter(accelerator_filter_.get());
 #endif
 
   system_gesture_filter_.reset(new internal::SystemGestureEventFilter);
   AddEnvEventFilter(system_gesture_filter_.get());
 
@@ skipping 399 matching lines @@
 
 bool Shell::CanAcceptEvents() {
   return true;
 }
 
 ui::EventTarget* Shell::GetParentTarget() {
   return NULL;
 }
 
 }  // namespace ash