Part 5 of cc/ directory shuffles: input

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681

BUG=190824
TBR=piman@chromium.org, enne@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188691 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 40 insertions, 40 deletions

diff --git a/cc/cc.gyp b/cc/cc.gyp
index 48c6a3b..f3aa10f 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -85,7 +85,7 @@
       'image_layer_updater.h',
       'image_layer.cc',
       'image_layer.h',
-      'input_handler.h',
+      'input/input_handler.h',
       'io_surface_draw_quad.cc',
       'io_surface_draw_quad.h',
       'io_surface_layer.cc',
@@ -146,8 +146,8 @@
       'output/output_surface_client.h',
       'debug/overdraw_metrics.cc',
       'debug/overdraw_metrics.h',
-      'page_scale_animation.cc',
-      'page_scale_animation.h',
+      'input/page_scale_animation.cc',
+      'input/page_scale_animation.h',
       'debug/paint_time_counter.cc',
       'debug/paint_time_counter.h',
       'picture.cc',
@@ -307,9 +307,9 @@
       'time_source.h',
       'timing_function.cc',
       'timing_function.h',
-      'top_controls_manager.cc',
-      'top_controls_manager.h',
-      'top_controls_manager_client.h',
+      'input/top_controls_manager.cc',
+      'input/top_controls_manager.h',
+      'input/top_controls_manager_client.h',
       'transferable_resource.cc',
       'transferable_resource.h',
       'transform_operation.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 67382cf..3dd3946 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -65,7 +65,7 @@
       'tiled_layer_impl_unittest.cc',
       'tiled_layer_unittest.cc',
       'base/tiling_data_unittest.cc',
-      'top_controls_manager_unittest.cc',
+      'input/top_controls_manager_unittest.cc',
       'transform_operations_unittest.cc',
       'tree_synchronizer_unittest.cc',
       'timing_function_unittest.cc',
diff --git a/cc/input_handler.h b/cc/input/input_handler.h
index 81bbeab..04973d5 100644
--- a/cc/input_handler.h
+++ b/cc/input/input_handler.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 CC_INPUT_HANDLER_H_
-#define CC_INPUT_HANDLER_H_
+#ifndef CC_INPUT_INPUT_HANDLER_H_
+#define CC_INPUT_INPUT_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/time.h"
@@ -95,4 +95,4 @@ class CC_EXPORT InputHandler {
 
 }  // namespace cc
 
-#endif  // CC_INPUT_HANDLER_H_
+#endif  // CC_INPUT_INPUT_HANDLER_H_
diff --git a/cc/page_scale_animation.cc b/cc/input/page_scale_animation.cc
index 2810bb9..f4f4061 100644
--- a/cc/page_scale_animation.cc
+++ b/cc/input/page_scale_animation.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 "cc/page_scale_animation.h"
+#include "cc/input/page_scale_animation.h"
+
+#include <math.h>
 
 #include "base/logging.h"
 #include "ui/gfx/point_f.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/vector2d_conversions.h"
 
-#include <math.h>
-
 namespace {
 
 // This takes a viewport-relative vector and returns a vector whose values are
diff --git a/cc/page_scale_animation.h b/cc/input/page_scale_animation.h
index b072e2054..09fbd15 100644
--- a/cc/page_scale_animation.h
+++ b/cc/input/page_scale_animation.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 CC_PAGE_SCALE_ANIMATION_H_
-#define CC_PAGE_SCALE_ANIMATION_H_
+#ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_
+#define CC_INPUT_PAGE_SCALE_ANIMATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -101,4 +101,4 @@ class PageScaleAnimation {
 
 }  // namespace cc
 
-#endif  // CC_PAGE_SCALE_ANIMATION_H_
+#endif  // CC_INPUT_PAGE_SCALE_ANIMATION_H_
diff --git a/cc/top_controls_manager.cc b/cc/input/top_controls_manager.cc
index eee9531..24dc359 100644
--- a/cc/top_controls_manager.cc
+++ b/cc/input/top_controls_manager.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/top_controls_manager.h"
+#include "cc/input/top_controls_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "cc/animation/keyframed_animation_curve.h"
+#include "cc/input/top_controls_manager_client.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/timing_function.h"
-#include "cc/top_controls_manager_client.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector2d_f.h"
 
diff --git a/cc/top_controls_manager.h b/cc/input/top_controls_manager.h
index d319991..5a60a9a 100644
--- a/cc/top_controls_manager.h
+++ b/cc/input/top_controls_manager.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 CC_TOP_CONTROLS_MANAGER_H_
-#define CC_TOP_CONTROLS_MANAGER_H_
+#ifndef CC_INPUT_TOP_CONTROLS_MANAGER_H_
+#define CC_INPUT_TOP_CONTROLS_MANAGER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -93,4 +93,4 @@ class CC_EXPORT TopControlsManager
 
 }  // namespace cc
 
-#endif  // CC_TOP_CONTROLS_MANAGER_H_
+#endif  // CC_INPUT_TOP_CONTROLS_MANAGER_H_
diff --git a/cc/top_controls_manager_client.h b/cc/input/top_controls_manager_client.h
index e54aa4d..b90de7c8 100644
--- a/cc/top_controls_manager_client.h
+++ b/cc/input/top_controls_manager_client.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 CC_TOP_CONTROLS_MANAGER_CLIENT_H_
-#define CC_TOP_CONTROLS_MANAGER_CLIENT_H_
+#ifndef CC_INPUT_TOP_CONTROLS_MANAGER_CLIENT_H_
+#define CC_INPUT_TOP_CONTROLS_MANAGER_CLIENT_H_
 
 namespace cc {
 
@@ -21,4 +21,4 @@ class CC_EXPORT TopControlsManagerClient {
 
 }  // namespace cc
 
-#endif  // CC_TOP_CONTROLS_MANAGER_CLIENT_H_
+#endif  // CC_INPUT_TOP_CONTROLS_MANAGER_CLIENT_H_
diff --git a/cc/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc
index c4e378c..0e426a0 100644
--- a/cc/top_controls_manager_unittest.cc
+++ b/cc/input/top_controls_manager_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 "cc/top_controls_manager.h"
+#include "cc/input/top_controls_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
+#include "cc/input/top_controls_manager_client.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
-#include "cc/top_controls_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/vector2d_f.h"
 
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 39c7c8a..1e3e27b 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -16,7 +16,7 @@
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/draw_properties.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/render_pass.h"
 #include "cc/render_surface_impl.h"
 #include "cc/resource_provider.h"
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 1934e57..fb73da9 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -18,6 +18,7 @@
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/heads_up_display_layer_impl.h"
+#include "cc/input/top_controls_manager.h"
 #include "cc/layer.h"
 #include "cc/layer_iterator.h"
 #include "cc/layer_tree_host_client.h"
@@ -32,7 +33,6 @@
 #include "cc/scrollbar_layer.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/thread_proxy.h"
-#include "cc/top_controls_manager.h"
 #include "cc/tree_synchronizer.h"
 
 namespace {
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 8bcb8b8..69c759c 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -24,6 +24,8 @@
 #include "cc/debug/rendering_stats.h"
 #include "cc/delay_based_time_source.h"
 #include "cc/heads_up_display_layer_impl.h"
+#include "cc/input/page_scale_animation.h"
+#include "cc/input/top_controls_manager.h"
 #include "cc/layer_iterator.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_common.h"
@@ -33,7 +35,6 @@
 #include "cc/output/delegating_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
-#include "cc/page_scale_animation.h"
 #include "cc/picture_layer_tiling.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/quad_culler.h"
@@ -43,7 +44,6 @@
 #include "cc/single_thread_proxy.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_uploader.h"
-#include "cc/top_controls_manager.h"
 #include "cc/tree_synchronizer.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 172b8f1..c2020a3 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -11,13 +11,13 @@
 #include "cc/animation/animation_events.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/base/cc_export.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
+#include "cc/input/top_controls_manager_client.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_sink.h"
 #include "cc/tile_manager.h"
-#include "cc/top_controls_manager_client.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPicture.h"
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 4c12629..43fa191 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -12,6 +12,7 @@
 #include "cc/base/math_util.h"
 #include "cc/delegated_renderer_layer_impl.h"
 #include "cc/heads_up_display_layer_impl.h"
+#include "cc/input/top_controls_manager.h"
 #include "cc/io_surface_layer_impl.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tiling_data.h"
@@ -38,7 +39,6 @@
 #include "cc/texture_layer_impl.h"
 #include "cc/tile_draw_quad.h"
 #include "cc/tiled_layer_impl.h"
-#include "cc/top_controls_manager.h"
 #include "cc/video_layer_impl.h"
 #include "media/base/media.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index 65a40ef..e781773 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/layer_tree_host.h"
 #include "cc/test/fake_context_provider.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index ca39cb6..f4bffcb 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -9,7 +9,7 @@
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/thread_impl.h"
 #include "cc/content_layer.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_impl.h"
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index f2eb5a9..c90e9bd 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -11,7 +11,7 @@
 #include "cc/delay_based_time_source.h"
 #include "cc/draw_quad.h"
 #include "cc/frame_rate_controller.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/output/context_provider.h"
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 2b11d68..479ab74 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -16,7 +16,7 @@
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/thread_impl.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
 #include "cc/output/context_provider.h"
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 8abbb2b..0167940 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -15,7 +15,7 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/thread_impl.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
 #include "cc/output/context_provider.h"
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
index 4067aa9e..edd3d6e 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
@@ -11,7 +11,7 @@
 #include "cc/base/thread.h"
 #include "cc/base/thread_impl.h"
 #include "cc/debug/fake_web_graphics_context_3d.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
 #include "cc/output/context_provider.h"
diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h
index 06f5ccb..4eca7b8 100644
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h
@@ -6,7 +6,7 @@
 #define WebToCCInputHandlerAdapter_h
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/input_handler.h"
+#include "cc/input/input_handler.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"
 #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"