trunk/src/ui/views/controls/textfield/native_textfield_views.cc - Issue 14383009: Revert 196479 "Revert 196446 "Make touch drag drop and touch edi..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ui/views/controls/textfield/native_textfield_views.cc

Issue 14383009: Revert 196479 "Revert 196446 "Make touch drag drop and touch edi..." (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:

Index: trunk/src/ui/views/controls/textfield/native_textfield_views.cc

===================================================================

--- trunk/src/ui/views/controls/textfield/native_textfield_views.cc (revision 196797)

+++ trunk/src/ui/views/controls/textfield/native_textfield_views.cc (working copy)

@@ -8,7 +8,6 @@

#include <set>

#include "base/bind.h"

-#include "base/command_line.h"

#include "base/debug/trace_event.h"

#include "base/i18n/case_conversion.h"

#include "base/logging.h"

@@ -24,7 +23,7 @@

#include "ui/base/events/event.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/range/range.h"

-#include "ui/base/ui_base_switches.h"

+#include "ui/base/ui_base_switches_util.h"

#include "ui/compositor/layer.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/insets.h"

@@ -201,8 +200,7 @@

OnAfterUserAction();

if (touch_selection_controller_.get())

event->SetHandled();

- } else if (CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableTouchDragDrop)) {

+ } else if (switches::IsTouchDragDropEnabled()) {

touch_selection_controller_.reset();

} else {

if (!touch_selection_controller_.get())

« no previous file with comments | « trunk/src/ui/ui.gyp ('k') | trunk/src/ui/views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »