content/renderer/render_view_impl.cc - Issue 14286004: Make touch drag drop and touch editing flags tri-state and turn them on by

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: content/renderer/render_view_impl.cc

Issue 14286004: Make touch drag drop and touch editing flags tri-state and turn them on by (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« content/browser/renderer_host/render_process_host_impl.cc ('K') | « content/browser/web_contents/touch_editable_impl_aura.cc ('k') | ui/base/ui_base_switches.h » ('j') | ui/base/ui_base_switches.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index 288b2de1f18f8b5cb719cc0a5039efa2e6d25f9e..9632507fa8842f0c34990cc2cfc283307294ae7e 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -182,6 +182,7 @@

#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h"

#include "ui/base/ui_base_switches.h"

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

#include "ui/gfx/native_widget_types.h"

#include "ui/gfx/point.h"

#include "ui/gfx/rect.h"

@@ -746,10 +747,10 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {

webkit_preferences_.Apply(webview());

webview()->initializeMainFrame(this);

- if (command_line.HasSwitch(switches::kEnableTouchDragDrop))

+ if (switches::IsTouchDragDropEnabled())

webview()->settings()->setTouchDragDropEnabled(true);

- if (command_line.HasSwitch(switches::kEnableTouchEditing))

+ if (switches::IsTouchEditingEnabled())

webview()->settings()->setTouchEditingEnabled(true);

if (!params->frame_name.empty())