Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: ash/drag_drop/drag_drop_controller.cc

Issue 9221014: aura: Gesture event plumbing (skeleton). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/ime/input_method_event_filter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/drag_drop/drag_drop_controller.h" 5 #include "ash/drag_drop/drag_drop_controller.h"
6 6
7 #include "ash/drag_drop/drag_image_view.h" 7 #include "ash/drag_drop/drag_image_view.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "ui/aura/client/drag_drop_delegate.h" 10 #include "ui/aura/client/drag_drop_delegate.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 } 173 }
174 return true; 174 return true;
175 } 175 }
176 176
177 ui::TouchStatus DragDropController::PreHandleTouchEvent( 177 ui::TouchStatus DragDropController::PreHandleTouchEvent(
178 aura::Window* target, 178 aura::Window* target,
179 aura::TouchEvent* event) { 179 aura::TouchEvent* event) {
180 return ui::TOUCH_STATUS_UNKNOWN; 180 return ui::TOUCH_STATUS_UNKNOWN;
181 } 181 }
182 182
183 ui::GestureStatus DragDropController::PreHandleGestureEvent(
184 aura::Window* target,
185 aura::GestureEvent* event) {
186 return ui::GESTURE_STATUS_UNKNOWN;
187 }
188
183 //////////////////////////////////////////////////////////////////////////////// 189 ////////////////////////////////////////////////////////////////////////////////
184 // DragDropController, private: 190 // DragDropController, private:
185 191
186 void DragDropController::OnLayerAnimationEnded( 192 void DragDropController::OnLayerAnimationEnded(
187 const ui::LayerAnimationSequence* sequence) { 193 const ui::LayerAnimationSequence* sequence) {
188 DCHECK(drag_image_.get()); 194 DCHECK(drag_image_.get());
189 drag_image_.reset(); 195 drag_image_.reset();
190 } 196 }
191 197
192 void DragDropController::OnLayerAnimationAborted( 198 void DragDropController::OnLayerAnimationAborted(
(...skipping 13 matching lines...) Expand all
206 window->SetBounds(gfx::Rect(drag_start_location_, window->bounds().size())); 212 window->SetBounds(gfx::Rect(drag_start_location_, window->bounds().size()));
207 } 213 }
208 214
209 void DragDropController::Cleanup() { 215 void DragDropController::Cleanup() {
210 drag_data_ = NULL; 216 drag_data_ = NULL;
211 drag_drop_in_progress_ = false; 217 drag_drop_in_progress_ = false;
212 } 218 }
213 219
214 } // namespace internal 220 } // namespace internal
215 } // namespace ash 221 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/ime/input_method_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698