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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/renderer/render_view_impl.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc ('k') | trunk/src/ui/base/ui_base_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/renderer/render_view_impl.cc
===================================================================
--- trunk/src/content/renderer/render_view_impl.cc (revision 196797)
+++ trunk/src/content/renderer/render_view_impl.cc (working copy)
@@ -181,7 +181,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#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 +746,10 @@
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())
« no previous file with comments | « trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc ('k') | trunk/src/ui/base/ui_base_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698