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

Side by Side Diff: ui/aura_shell/drag_drop_controller.cc

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, review Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/drag_drop_controller.h" 5 #include "ui/aura_shell/drag_drop_controller.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/client/window_drag_drop_delegate.h" 9 #include "ui/aura/client/window_drag_drop_delegate.h"
10 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 bool DragDropController::IsDragDropInProgress() { 138 bool DragDropController::IsDragDropInProgress() {
139 return drag_drop_in_progress_; 139 return drag_drop_in_progress_;
140 } 140 }
141 141
142 bool DragDropController::PreHandleKeyEvent(aura::Window* target, 142 bool DragDropController::PreHandleKeyEvent(aura::Window* target,
143 aura::KeyEvent* event) { 143 aura::KeyEvent* event) {
144 return false; 144 return false;
145 } 145 }
146 146
147 bool DragDropController::PreHandleTranslatedKeyEvent(
148 aura::Window* target,
149 aura::TranslatedKeyEvent* event) {
150 return false;
151 }
152
147 bool DragDropController::PreHandleMouseEvent(aura::Window* target, 153 bool DragDropController::PreHandleMouseEvent(aura::Window* target,
148 aura::MouseEvent* event) { 154 aura::MouseEvent* event) {
149 if (!drag_drop_in_progress_) 155 if (!drag_drop_in_progress_)
150 return false; 156 return false;
151 switch (event->type()) { 157 switch (event->type()) {
152 case ui::ET_MOUSE_DRAGGED: 158 case ui::ET_MOUSE_DRAGGED:
153 DragUpdate(target, *event); 159 DragUpdate(target, *event);
154 break; 160 break;
155 case ui::ET_MOUSE_RELEASED: 161 case ui::ET_MOUSE_RELEASED:
156 Drop(target, *event); 162 Drop(target, *event);
(...skipping 18 matching lines...) Expand all
175 // DragDropController, private: 181 // DragDropController, private:
176 182
177 void DragDropController::Cleanup() { 183 void DragDropController::Cleanup() {
178 drag_image_.reset(); 184 drag_image_.reset();
179 drag_data_ = NULL; 185 drag_data_ = NULL;
180 drag_drop_in_progress_ = false; 186 drag_drop_in_progress_ = false;
181 } 187 }
182 188
183 } // namespace internal 189 } // namespace internal
184 } // namespace aura_shell 190 } // namespace aura_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698