Moves mojo/services/* to components/* part 2

Moves window_manager

R=ben@chromium.org
TBR=ben@chromium.org
BUG=none
TEST=none

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

Cr-Commit-Position: refs/heads/master@{#325952}

41 files changed, 140 insertions, 138 deletions

diff --git a/mojo/services/window_manager/BUILD.gn b/components/window_manager/BUILD.gn
index 74259dc..74259dc 100644
--- a/mojo/services/window_manager/BUILD.gn
+++ b/components/window_manager/BUILD.gn
diff --git a/mojo/services/window_manager/DEPS b/components/window_manager/DEPS
index 4a637c6..0f0ab41 100644
--- a/mojo/services/window_manager/DEPS
+++ b/components/window_manager/DEPS
@@ -1,6 +1,8 @@
 include_rules = [
   "+mojo/application",
+  "+mojo/common",
   "+mojo/converters",
+  "+third_party/mojo/src/mojo/public",
   "+third_party/mojo_services",
   "+ui",
 ]
diff --git a/mojo/services/window_manager/basic_focus_rules.cc b/components/window_manager/basic_focus_rules.cc
index 5ba49af..924a110 100644
--- a/mojo/services/window_manager/basic_focus_rules.cc
+++ b/components/window_manager/basic_focus_rules.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/basic_focus_rules.h"
+#include "components/window_manager/basic_focus_rules.h"
 
 #include "base/macros.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
diff --git a/mojo/services/window_manager/basic_focus_rules.h b/components/window_manager/basic_focus_rules.h
index d14a9b0d..6f31b4c 100644
--- a/mojo/services/window_manager/basic_focus_rules.h
+++ b/components/window_manager/basic_focus_rules.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_BASIC_FOCUS_RULES_H_
-#define SERVICES_WINDOW_MANAGER_BASIC_FOCUS_RULES_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_BASIC_FOCUS_RULES_H_
+#define COMPONENTS_WINDOW_MANAGER_BASIC_FOCUS_RULES_H_
 
-#include "mojo/services/window_manager/focus_rules.h"
+#include "components/window_manager/focus_rules.h"
 
 namespace mojo {
 class View;
@@ -46,4 +46,4 @@ class BasicFocusRules : public FocusRules {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_BASIC_FOCUS_RULES_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_BASIC_FOCUS_RULES_H_
diff --git a/mojo/services/window_manager/capture_controller.cc b/components/window_manager/capture_controller.cc
index ad6891c..f8902b9 100644
--- a/mojo/services/window_manager/capture_controller.cc
+++ b/components/window_manager/capture_controller.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/capture_controller.h"
+#include "components/window_manager/capture_controller.h"
 
-#include "mojo/services/window_manager/capture_controller_observer.h"
+#include "components/window_manager/capture_controller_observer.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_property.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_tracker.h"
 
diff --git a/mojo/services/window_manager/capture_controller.h b/components/window_manager/capture_controller.h
index 64a3339..761bc27 100644
--- a/mojo/services/window_manager/capture_controller.h
+++ b/components/window_manager/capture_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
-#define SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
+#define COMPONENTS_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
 
 #include "base/observer_list.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h"
@@ -46,4 +46,4 @@ mojo::View* GetCaptureView(mojo::View* view);
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
diff --git a/mojo/services/window_manager/capture_controller_observer.h b/components/window_manager/capture_controller_observer.h
index a9abc3c..6072622 100644
--- a/mojo/services/window_manager/capture_controller_observer.h
+++ b/components/window_manager/capture_controller_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_OBSERVER_H_
-#define SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_OBSERVER_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_CAPTURE_CONTROLLER_OBSERVER_H_
+#define COMPONENTS_WINDOW_MANAGER_CAPTURE_CONTROLLER_OBSERVER_H_
 
 namespace mojo {
 class View;
@@ -21,4 +21,4 @@ class CaptureControllerObserver {
 
 }  // namespace window_manager
 
-#endif // SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_OBSERVER_H_
+#endif // COMPONENTS_WINDOW_MANAGER_CAPTURE_CONTROLLER_OBSERVER_H_
diff --git a/mojo/services/window_manager/focus_controller.cc b/components/window_manager/focus_controller.cc
index 25d60d6..1eb4154 100644
--- a/mojo/services/window_manager/focus_controller.cc
+++ b/components/window_manager/focus_controller.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/focus_controller.h"
+#include "components/window_manager/focus_controller.h"
 
 #include "base/auto_reset.h"
-#include "mojo/services/window_manager/focus_controller_observer.h"
-#include "mojo/services/window_manager/focus_rules.h"
-#include "mojo/services/window_manager/view_target.h"
-#include "mojo/services/window_manager/window_manager_app.h"
+#include "components/window_manager/focus_controller_observer.h"
+#include "components/window_manager/focus_rules.h"
+#include "components/window_manager/view_target.h"
+#include "components/window_manager/window_manager_app.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_property.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_tracker.h"
 #include "ui/events/event.h"
diff --git a/mojo/services/window_manager/focus_controller.h b/components/window_manager/focus_controller.h
index 8a9e8ef..39d7d8d 100644
--- a/mojo/services/window_manager/focus_controller.h
+++ b/components/window_manager/focus_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
-#define SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
+#define COMPONENTS_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -99,4 +99,4 @@ FocusController* GetFocusController(mojo::View* view);
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
diff --git a/mojo/services/window_manager/focus_controller_observer.h b/components/window_manager/focus_controller_observer.h
index c5960b0..7f37f8c 100644
--- a/mojo/services/window_manager/focus_controller_observer.h
+++ b/components/window_manager/focus_controller_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
-#define SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
+#define COMPONENTS_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
 
 namespace mojo {
 class View;
@@ -32,4 +32,4 @@ class FocusControllerObserver {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
diff --git a/mojo/services/window_manager/focus_controller_unittest.cc b/components/window_manager/focus_controller_unittest.cc
index ea60ac7..9c88814 100644
--- a/mojo/services/window_manager/focus_controller_unittest.cc
+++ b/components/window_manager/focus_controller_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/focus_controller.h"
-
+#include "components/window_manager/focus_controller.h"
+
+#include "components/window_manager/basic_focus_rules.h"
+#include "components/window_manager/capture_controller.h"
+#include "components/window_manager/focus_controller_observer.h"
+#include "components/window_manager/view_event_dispatcher.h"
+#include "components/window_manager/view_targeter.h"
+#include "components/window_manager/window_manager_test_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/services/window_manager/basic_focus_rules.h"
-#include "mojo/services/window_manager/capture_controller.h"
-#include "mojo/services/window_manager/focus_controller_observer.h"
-#include "mojo/services/window_manager/view_event_dispatcher.h"
-#include "mojo/services/window_manager/view_targeter.h"
-#include "mojo/services/window_manager/window_manager_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/mojo/services/window_manager/focus_rules.h b/components/window_manager/focus_rules.h
index becd114..3514c7f 100644
--- a/mojo/services/window_manager/focus_rules.h
+++ b/components/window_manager/focus_rules.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_FOCUS_RULES_H_
-#define SERVICES_WINDOW_MANAGER_FOCUS_RULES_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_FOCUS_RULES_H_
+#define COMPONENTS_WINDOW_MANAGER_FOCUS_RULES_H_
 
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
@@ -62,4 +62,4 @@ class FocusRules {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_FOCUS_RULES_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_FOCUS_RULES_H_
diff --git a/mojo/services/window_manager/hit_test.h b/components/window_manager/hit_test.h
index 747dd01..37a7ea5 100644
--- a/mojo/services/window_manager/hit_test.h
+++ b/components/window_manager/hit_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_HIT_TEST_H_
-#define SERVICES_WINDOW_MANAGER_HIT_TEST_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_HIT_TEST_H_
+#define COMPONENTS_WINDOW_MANAGER_HIT_TEST_H_
 
 #if !defined(OS_WIN)
 
@@ -42,4 +42,4 @@ enum HitTestCompat {
 
 #endif  // !defined(OS_WIN)
 
-#endif  // SERVICES_WINDOW_MANAGER_HIT_TEST_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_HIT_TEST_H_
diff --git a/mojo/services/window_manager/main.cc b/components/window_manager/main.cc
index 701a249..5edfec9 100644
--- a/mojo/services/window_manager/main.cc
+++ b/components/window_manager/main.cc
@@ -3,14 +3,14 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
+#include "components/window_manager/basic_focus_rules.h"
+#include "components/window_manager/window_manager_app.h"
+#include "components/window_manager/window_manager_delegate.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
-#include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/window_manager/basic_focus_rules.h"
-#include "mojo/services/window_manager/window_manager_app.h"
-#include "mojo/services/window_manager/window_manager_delegate.h"
+#include "third_party/mojo/src/mojo/public/c/system/main.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"
 
diff --git a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc b/components/window_manager/native_viewport_event_dispatcher_impl.cc
index 4bd0b80..4c77e96 100644
--- a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.cc
+++ b/components/window_manager/native_viewport_event_dispatcher_impl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/native_viewport_event_dispatcher_impl.h"
+#include "components/window_manager/native_viewport_event_dispatcher_impl.h"
 
+#include "components/window_manager/view_event_dispatcher.h"
+#include "components/window_manager/window_manager_app.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/services/window_manager/view_event_dispatcher.h"
-#include "mojo/services/window_manager/window_manager_app.h"
 
 namespace window_manager {
 
diff --git a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.h b/components/window_manager/native_viewport_event_dispatcher_impl.h
index 6624c93..ac90837 100644
--- a/mojo/services/window_manager/native_viewport_event_dispatcher_impl.h
+++ b/components/window_manager/native_viewport_event_dispatcher_impl.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_NATIVE_VIEWPORT_EVENT_DISPATCHER_IMPL_H_
-#define SERVICES_WINDOW_MANAGER_NATIVE_VIEWPORT_EVENT_DISPATCHER_IMPL_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_NATIVE_VIEWPORT_EVENT_DISPATCHER_IMPL_H_
+#define COMPONENTS_WINDOW_MANAGER_NATIVE_VIEWPORT_EVENT_DISPATCHER_IMPL_H_
 
 #include "base/basictypes.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/mojo_services/src/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "ui/events/event_source.h"
 
@@ -39,4 +39,4 @@ class NativeViewportEventDispatcherImpl
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_NATIVE_VIEWPORT_EVENT_DISPATCHER_IMPL_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_NATIVE_VIEWPORT_EVENT_DISPATCHER_IMPL_H_
diff --git a/mojo/services/window_manager/run_all_unittests.cc b/components/window_manager/run_all_unittests.cc
index 51fd967..51fd967 100644
--- a/mojo/services/window_manager/run_all_unittests.cc
+++ b/components/window_manager/run_all_unittests.cc
diff --git a/mojo/services/window_manager/view_event_dispatcher.cc b/components/window_manager/view_event_dispatcher.cc
index 657cf88..b09caa8 100644
--- a/mojo/services/window_manager/view_event_dispatcher.cc
+++ b/components/window_manager/view_event_dispatcher.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/view_event_dispatcher.h"
+#include "components/window_manager/view_event_dispatcher.h"
 
-#include "mojo/services/window_manager/view_target.h"
+#include "components/window_manager/view_target.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 
 namespace window_manager {
diff --git a/mojo/services/window_manager/view_event_dispatcher.h b/components/window_manager/view_event_dispatcher.h
index 399939e..8757e63 100644
--- a/mojo/services/window_manager/view_event_dispatcher.h
+++ b/components/window_manager/view_event_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_VIEW_EVENT_DISPATCHER_H_
-#define SERVICES_WINDOW_MANAGER_VIEW_EVENT_DISPATCHER_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_VIEW_EVENT_DISPATCHER_H_
+#define COMPONENTS_WINDOW_MANAGER_VIEW_EVENT_DISPATCHER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_processor.h"
@@ -44,4 +44,4 @@ class ViewEventDispatcher : public ui::EventProcessor {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_VIEW_EVENT_DISPATCHER_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_VIEW_EVENT_DISPATCHER_H_
diff --git a/mojo/services/window_manager/view_target.cc b/components/window_manager/view_target.cc
index adb3ec2..0f9d1a2 100644
--- a/mojo/services/window_manager/view_target.cc
+++ b/components/window_manager/view_target.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/view_target.h"
+#include "components/window_manager/view_target.h"
 
+#include "components/window_manager/view_targeter.h"
+#include "components/window_manager/window_manager_app.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/services/window_manager/view_targeter.h"
-#include "mojo/services/window_manager/window_manager_app.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_property.h"
 #include "ui/events/event.h"
diff --git a/mojo/services/window_manager/view_target.h b/components/window_manager/view_target.h
index 1119e1f..5bfa4da 100644
--- a/mojo/services/window_manager/view_target.h
+++ b/components/window_manager/view_target.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_VIEW_TARGET_H_
-#define SERVICES_WINDOW_MANAGER_VIEW_TARGET_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_VIEW_TARGET_H_
+#define COMPONENTS_WINDOW_MANAGER_VIEW_TARGET_H_
 
 #include "ui/events/event_target.h"
 
@@ -97,4 +97,4 @@ class ViewTarget : public ui::EventTarget {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_VIEW_TARGET_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_VIEW_TARGET_H_
diff --git a/mojo/services/window_manager/view_target_unittest.cc b/components/window_manager/view_target_unittest.cc
index bec5c37..3f334dc 100644
--- a/mojo/services/window_manager/view_target_unittest.cc
+++ b/components/window_manager/view_target_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/view_target.h"
+#include "components/window_manager/view_target.h"
 
 #include <set>
 
-#include "mojo/services/window_manager/window_manager_test_util.h"
+#include "components/window_manager/window_manager_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/mojo/services/window_manager/view_targeter.cc b/components/window_manager/view_targeter.cc
index 58fb370..96c8fb9 100644
--- a/mojo/services/window_manager/view_targeter.cc
+++ b/components/window_manager/view_targeter.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/view_targeter.h"
+#include "components/window_manager/view_targeter.h"
 
-#include "mojo/services/window_manager/capture_controller.h"
-#include "mojo/services/window_manager/focus_controller.h"
-#include "mojo/services/window_manager/view_target.h"
+#include "components/window_manager/capture_controller.h"
+#include "components/window_manager/focus_controller.h"
+#include "components/window_manager/view_target.h"
 
 namespace window_manager {
 
diff --git a/mojo/services/window_manager/view_targeter.h b/components/window_manager/view_targeter.h
index 3a01e57..75ca1de 100644
--- a/mojo/services/window_manager/view_targeter.h
+++ b/components/window_manager/view_targeter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_VIEW_TARGETER_H_
-#define SERVICES_WINDOW_MANAGER_VIEW_TARGETER_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_VIEW_TARGETER_H_
+#define COMPONENTS_WINDOW_MANAGER_VIEW_TARGETER_H_
 
 #include "ui/events/event_targeter.h"
 
@@ -41,4 +41,4 @@ class ViewTargeter : public ui::EventTargeter {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_VIEW_TARGETER_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_VIEW_TARGETER_H_
diff --git a/mojo/services/window_manager/view_targeter_unittest.cc b/components/window_manager/view_targeter_unittest.cc
index 0b3281d..12a36d0 100644
--- a/mojo/services/window_manager/view_targeter_unittest.cc
+++ b/components/window_manager/view_targeter_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/view_targeter.h"
+#include "components/window_manager/view_targeter.h"
 
-#include "mojo/services/window_manager/basic_focus_rules.h"
-#include "mojo/services/window_manager/capture_controller.h"
-#include "mojo/services/window_manager/focus_controller.h"
-#include "mojo/services/window_manager/view_event_dispatcher.h"
-#include "mojo/services/window_manager/window_manager_test_util.h"
+#include "components/window_manager/basic_focus_rules.h"
+#include "components/window_manager/capture_controller.h"
+#include "components/window_manager/focus_controller.h"
+#include "components/window_manager/view_event_dispatcher.h"
+#include "components/window_manager/window_manager_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/test_event_handler.h"
diff --git a/mojo/services/window_manager/window_manager_app.cc b/components/window_manager/window_manager_app.cc
index 99d2b35..3c3668f 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/components/window_manager/window_manager_app.cc
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/window_manager_app.h"
+#include "components/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
+#include "components/window_manager/capture_controller.h"
+#include "components/window_manager/focus_controller.h"
+#include "components/window_manager/focus_rules.h"
+#include "components/window_manager/hit_test.h"
+#include "components/window_manager/view_event_dispatcher.h"
+#include "components/window_manager/view_target.h"
+#include "components/window_manager/view_targeter.h"
+#include "components/window_manager/window_manager_delegate.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/window_manager/capture_controller.h"
-#include "mojo/services/window_manager/focus_controller.h"
-#include "mojo/services/window_manager/focus_rules.h"
-#include "mojo/services/window_manager/hit_test.h"
-#include "mojo/services/window_manager/view_event_dispatcher.h"
-#include "mojo/services/window_manager/view_target.h"
-#include "mojo/services/window_manager/view_targeter.h"
-#include "mojo/services/window_manager/window_manager_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"
 
diff --git a/mojo/services/window_manager/window_manager_app.h b/components/window_manager/window_manager_app.h
index f91be46..ff81f3d 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/components/window_manager/window_manager_app.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
-#define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
+#define COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/window_manager/capture_controller_observer.h"
-#include "mojo/services/window_manager/focus_controller_observer.h"
-#include "mojo/services/window_manager/native_viewport_event_dispatcher_impl.h"
-#include "mojo/services/window_manager/view_target.h"
-#include "mojo/services/window_manager/window_manager_impl.h"
+#include "components/window_manager/capture_controller_observer.h"
+#include "components/window_manager/focus_controller_observer.h"
+#include "components/window_manager/native_viewport_event_dispatcher_impl.h"
+#include "components/window_manager/view_target.h"
+#include "components/window_manager/window_manager_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"
@@ -210,4 +210,4 @@ class WindowManagerApp
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
diff --git a/mojo/services/window_manager/window_manager_app_android.cc b/components/window_manager/window_manager_app_android.cc
index 84feff1..3ec92c3 100644
--- a/mojo/services/window_manager/window_manager_app_android.cc
+++ b/components/window_manager/window_manager_app_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/window_manager_app.h"
+#include "components/window_manager/window_manager_app.h"
 
 #include <android/keycodes.h>
 
diff --git a/mojo/services/window_manager/window_manager_app_linux.cc b/components/window_manager/window_manager_app_linux.cc
index 11d43dc..effb54c 100644
--- a/mojo/services/window_manager/window_manager_app_linux.cc
+++ b/components/window_manager/window_manager_app_linux.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/window_manager_app.h"
+#include "components/window_manager/window_manager_app.h"
 
 namespace window_manager {
 
diff --git a/mojo/services/window_manager/window_manager_app_win.cc b/components/window_manager/window_manager_app_win.cc
index 11d43dc..effb54c 100644
--- a/mojo/services/window_manager/window_manager_app_win.cc
+++ b/components/window_manager/window_manager_app_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/window_manager_app.h"
+#include "components/window_manager/window_manager_app.h"
 
 namespace window_manager {
 
diff --git a/mojo/services/window_manager/window_manager_apptest.cc b/components/window_manager/window_manager_apptest.cc
index 390c037..41164f2 100644
--- a/mojo/services/window_manager/window_manager_apptest.cc
+++ b/components/window_manager/window_manager_apptest.cc
@@ -5,10 +5,10 @@
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/public/cpp/system/macros.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"
diff --git a/mojo/services/window_manager/window_manager_delegate.h b/components/window_manager/window_manager_delegate.h
index 277e3a8..bbfeefe 100644
--- a/mojo/services/window_manager/window_manager_delegate.h
+++ b/components/window_manager/window_manager_delegate.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
-#define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
+#define COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
 
-#include "mojo/public/cpp/bindings/string.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
+#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 
 namespace window_manager {
 
@@ -23,4 +23,4 @@ class WindowManagerDelegate {
 
 }  // namespace mojo
 
-#endif  // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
diff --git a/mojo/services/window_manager/window_manager_impl.cc b/components/window_manager/window_manager_impl.cc
index 99b3e2f..4a218d9 100644
--- a/mojo/services/window_manager/window_manager_impl.cc
+++ b/components/window_manager/window_manager_impl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/window_manager_impl.h"
+#include "components/window_manager/window_manager_impl.h"
 
-#include "mojo/services/window_manager/capture_controller.h"
-#include "mojo/services/window_manager/focus_controller.h"
-#include "mojo/services/window_manager/window_manager_app.h"
+#include "components/window_manager/capture_controller.h"
+#include "components/window_manager/focus_controller.h"
+#include "components/window_manager/window_manager_app.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 
 using mojo::Callback;
diff --git a/mojo/services/window_manager/window_manager_impl.h b/components/window_manager/window_manager_impl.h
index f51941f..c6c5a17 100644
--- a/mojo/services/window_manager/window_manager_impl.h
+++ b/components/window_manager/window_manager_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
-#define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
+#define COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/error_handler.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager.mojom.h"
 
@@ -65,4 +65,4 @@ class WindowManagerImpl : public mojo::WindowManager,
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
diff --git a/mojo/services/window_manager/window_manager_test_util.cc b/components/window_manager/window_manager_test_util.cc
index 7c3eb21..e1b6ca0 100644
--- a/mojo/services/window_manager/window_manager_test_util.cc
+++ b/components/window_manager/window_manager_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/window_manager/window_manager_test_util.h"
+#include "components/window_manager/window_manager_test_util.h"
 
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
diff --git a/mojo/services/window_manager/window_manager_test_util.h b/components/window_manager/window_manager_test_util.h
index 62424c7..3289429 100644
--- a/mojo/services/window_manager/window_manager_test_util.h
+++ b/components/window_manager/window_manager_test_util.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_TEST_UTIL_H_
-#define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_TEST_UTIL_H_
+#ifndef COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_TEST_UTIL_H_
+#define COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_TEST_UTIL_H_
 
 #include <set>
 
-#include "mojo/services/window_manager/view_target.h"
+#include "components/window_manager/view_target.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/lib/view_private.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 
@@ -40,4 +40,4 @@ class TestView : public mojo::View {
 
 }  // namespace window_manager
 
-#endif  // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_TEST_UTIL_H_
+#endif  // COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_TEST_UTIL_H_
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 59775e4..6360ca9 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -20,6 +20,7 @@ group("services") {
   if (!is_component_build) {
     deps += [
       "//components/clipboard",
+      "//components/window_manager:lib",
       "//mojo/services/html_viewer",
       "//mojo/services/kiosk_wm:window_manager",
       "//mojo/services/native_viewport",
@@ -27,17 +28,16 @@ group("services") {
       "//mojo/services/surfaces",
       "//mojo/services/tracing",
       "//mojo/services/view_manager",
-      "//mojo/services/window_manager:lib",
     ]
 
     # TODO(GYP): Make this work.
     if (is_mac) {
       deps -= [
+        "//components/window_manager:lib",
         "//mojo/services/html_viewer",
         "//mojo/services/kiosk_wm:window_manager",
         "//mojo/services/native_viewport",
         "//mojo/services/view_manager",
-        "//mojo/services/window_manager:lib",
       ]
     }
   }
@@ -50,17 +50,17 @@ group("tests") {
   ]
   if (!is_component_build) {
     deps += [
+      "//components/window_manager:window_manager_unittests",
       "//mojo/services/html_viewer:tests",
       "//mojo/services/view_manager:view_manager_service_unittests",
-      "//mojo/services/window_manager:window_manager_unittests",
     ]
 
     # TODO(GYP): Make this work.
     if (is_mac) {
       deps -= [
+        "//components/window_manager:window_manager_unittests",
         "//mojo/services/html_viewer:tests",
         "//mojo/services/view_manager:view_manager_service_unittests",
-        "//mojo/services/window_manager:window_manager_unittests",
       ]
     }
   }
@@ -74,18 +74,18 @@ group("apptests") {
   if (!is_component_build) {
     deps += [
       "//components/clipboard:apptests",
+      "//components/window_manager:apptests",
       "//mojo/services/html_viewer:apptests",
       "//mojo/services/network:apptests",
       "//mojo/services/view_manager:apptests",
-      "//mojo/services/window_manager:apptests",
     ]
 
     # TODO(GYP): Make this work.
     if (is_mac) {
       deps -= [
+        "//components/window_manager:apptests",
         "//mojo/services/html_viewer:apptests",
         "//mojo/services/view_manager:apptests",
-        "//mojo/services/window_manager:apptests",
       ]
     }
   }
diff --git a/mojo/services/kiosk_wm/BUILD.gn b/mojo/services/kiosk_wm/BUILD.gn
index 988c6c9..2e41546 100644
--- a/mojo/services/kiosk_wm/BUILD.gn
+++ b/mojo/services/kiosk_wm/BUILD.gn
@@ -21,6 +21,7 @@ mojo_native_application("window_manager") {
 
   deps = [
     "//base",
+    "//components/window_manager:lib",
     "//mojo/application",
     "//mojo/common:common",
     "//mojo/converters/geometry",
@@ -31,7 +32,6 @@ mojo_native_application("window_manager") {
     "//third_party/mojo_services/src/input_events/public/interfaces",
     "//third_party/mojo_services/src/navigation/public/interfaces",
     "//third_party/mojo_services/src/view_manager/public/cpp",
-    "//mojo/services/window_manager:lib",
     "//ui/base",
   ]
 }
diff --git a/mojo/services/kiosk_wm/DEPS b/mojo/services/kiosk_wm/DEPS
index 191abbe..0269410 100644
--- a/mojo/services/kiosk_wm/DEPS
+++ b/mojo/services/kiosk_wm/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+mojo/application",
-  "+mojo/services/window_manager",
+  "+components/window_manager",
   "+third_party/mojo_services",
   "+ui",
 ]
diff --git a/mojo/services/kiosk_wm/kiosk_wm.cc b/mojo/services/kiosk_wm/kiosk_wm.cc
index 5c03ade..392c52d 100644
--- a/mojo/services/kiosk_wm/kiosk_wm.cc
+++ b/mojo/services/kiosk_wm/kiosk_wm.cc
@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/window_manager/basic_focus_rules.h"
 #include "mojo/services/kiosk_wm/merged_service_provider.h"
-#include "mojo/services/window_manager/basic_focus_rules.h"
 
 namespace kiosk_wm {
 
diff --git a/mojo/services/kiosk_wm/kiosk_wm.h b/mojo/services/kiosk_wm/kiosk_wm.h
index 5ae0ded..f64c9df 100644
--- a/mojo/services/kiosk_wm/kiosk_wm.h
+++ b/mojo/services/kiosk_wm/kiosk_wm.h
@@ -6,13 +6,13 @@
 #define SERVICES_KIOSK_WM_KIOSK_WM_H_
 
 #include "base/memory/weak_ptr.h"
+#include "components/window_manager/window_manager_app.h"
+#include "components/window_manager/window_manager_delegate.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/kiosk_wm/navigator_host_impl.h"
-#include "mojo/services/window_manager/window_manager_app.h"
-#include "mojo/services/window_manager/window_manager_delegate.h"
 #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"