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

Unified Diff: trunk/src/ui/views/view.cc

Issue 14439009: Revert 196446 "Make touch drag drop and touch editing flags tri-..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/views/touchui/touch_selection_controller_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/view.cc
===================================================================
--- trunk/src/ui/views/view.cc (revision 196476)
+++ trunk/src/ui/views/view.cc (working copy)
@@ -9,6 +9,7 @@
#include <algorithm>
#include <cmath>
+#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
@@ -18,7 +19,7 @@
#include "third_party/skia/include/core/SkRect.h"
#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/ui_base_switches_util.h"
+#include "ui/base/ui_base_switches.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animator.h"
@@ -107,7 +108,8 @@
public:
explicit PostEventDispatchHandler(View* owner)
: owner_(owner),
- touch_dnd_enabled_(switches::IsTouchDragDropEnabled()) {
+ touch_dnd_enabled_(CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableTouchDragDrop)) {
}
virtual ~PostEventDispatchHandler() {}
« no previous file with comments | « trunk/src/ui/views/touchui/touch_selection_controller_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698