Index: components/mus/gesture_manager.cc |
diff --git a/components/view_manager/gesture_manager.cc b/components/mus/gesture_manager.cc |
similarity index 97% |
rename from components/view_manager/gesture_manager.cc |
rename to components/mus/gesture_manager.cc |
index 37bb4b01b4664e72570faa86f6d456b60f6cecc7..77a678c6d28bf87a79b119920a4c0376527769f0 100644 |
--- a/components/view_manager/gesture_manager.cc |
+++ b/components/mus/gesture_manager.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 "components/view_manager/gesture_manager.h" |
+#include "components/mus/gesture_manager.h" |
#include <algorithm> |
-#include "components/view_manager/gesture_manager_delegate.h" |
-#include "components/view_manager/public/cpp/keys.h" |
-#include "components/view_manager/server_view.h" |
-#include "components/view_manager/view_coordinate_conversions.h" |
-#include "components/view_manager/view_locator.h" |
+#include "components/mus/gesture_manager_delegate.h" |
+#include "components/mus/public/cpp/keys.h" |
+#include "components/mus/server_view.h" |
+#include "components/mus/view_coordinate_conversions.h" |
+#include "components/mus/view_locator.h" |
#include "ui/gfx/geometry/point_f.h" |
#include "ui/mojo/events/input_events.mojom.h" |
@@ -68,11 +68,9 @@ mojo::EventPtr CloneEventForView(const mojo::Event& event, |
// GestureStateChange ---------------------------------------------------------- |
GestureStateChange::GestureStateChange() |
- : chosen_gesture(GestureManager::kInvalidGestureId) { |
-} |
+ : chosen_gesture(GestureManager::kInvalidGestureId) {} |
-GestureStateChange::~GestureStateChange() { |
-} |
+GestureStateChange::~GestureStateChange() {} |
// ViewIterator ---------------------------------------------------------------- |
@@ -167,11 +165,10 @@ class GestureManager::Gesture { |
DISALLOW_COPY_AND_ASSIGN(Gesture); |
}; |
-GestureManager::Gesture::Gesture(uint32_t id) : id_(id), state_(STATE_INITIAL) { |
-} |
+GestureManager::Gesture::Gesture(uint32_t id) |
+ : id_(id), state_(STATE_INITIAL) {} |
-GestureManager::Gesture::~Gesture() { |
-} |
+GestureManager::Gesture::~Gesture() {} |
void GestureManager::Gesture::Attach(Pointer* pointer, const ServerView* view) { |
pointers_and_views_.insert(PointerAndView(pointer, view)); |
@@ -508,13 +505,11 @@ class GestureManager::ScheduledDeleteProcessor { |
// PointerAndView -------------------------------------------------------------- |
GestureManager::PointerAndView::PointerAndView() |
- : pointer(nullptr), view(nullptr) { |
-} |
+ : pointer(nullptr), view(nullptr) {} |
GestureManager::PointerAndView::PointerAndView(Pointer* pointer, |
const ServerView* view) |
- : pointer(pointer), view(view) { |
-} |
+ : pointer(pointer), view(view) {} |
bool GestureManager::PointerAndView::operator<( |
const PointerAndView& other) const { |
@@ -530,8 +525,7 @@ const uint32_t GestureManager::kInvalidGestureId = 0u; |
GestureManager::GestureManager(GestureManagerDelegate* delegate, |
const ServerView* root) |
- : delegate_(delegate), root_view_(root) { |
-} |
+ : delegate_(delegate), root_view_(root) {} |
GestureManager::~GestureManager() { |
// Explicitly delete the pointers first as this may result in calling back to |