diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-27 02:36:27 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-27 02:36:27 +0000 |
| commit | 1400e6dc12c13f62aa300dd4468019a08388daec (patch) | |
| tree | 250c21e5168f550b0a7d3bf16323f5a88a4efb11 /content | |
| parent | cd88f791eacd3f59a83af0fe1713db55ed03a352 (diff) | |
| download | chromium_src-1400e6dc12c13f62aa300dd4468019a08388daec.zip chromium_src-1400e6dc12c13f62aa300dd4468019a08388daec.tar.gz chromium_src-1400e6dc12c13f62aa300dd4468019a08388daec.tar.bz2 | |
Reland https://chromiumcodereview.appspot.com/14286004 which was reverted fue
to linux_chromeos_asan build break. The cause of the break has since been fixed
in https://codereview.chromium.org/14113034/
There are no additional changes from the original CL.
BUG=115237,168162
TBR=sky@chromium.org,avi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14283013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 6 | ||||
| -rw-r--r-- | content/browser/web_contents/touch_editable_impl_aura.cc | 8 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 6 |
3 files changed, 9 insertions, 11 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 53976d2..4fdd872 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -820,6 +820,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableSessionStorage, switches::kDisableSharedWorkers, switches::kDisableSpeechInput, + switches::kDisableTouchDragDrop, + switches::kDisableTouchEditing, #if defined(OS_ANDROID) switches::kEnableWebAudio, switches::kDisableWebRTC, @@ -843,6 +845,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnableGpuBenchmarking, switches::kEnableMemoryBenchmarking, switches::kEnableLogging, + switches::kEnableTouchDragDrop, + switches::kEnableTouchEditing, switches::kEnableVsyncNotification, switches::kEnableWebPInAcceptHeader, switches::kDisableMediaSource, @@ -870,8 +874,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnableHighDpiCompositingForFixedPosition, switches::kDisableCompositingForFixedPosition, switches::kEnableAcceleratedPainting, - switches::kEnableTouchDragDrop, - switches::kEnableTouchEditing, switches::kDisableThreadedCompositing, switches::kDisableTouchAdjustment, switches::kDefaultTileWidth, diff --git a/content/browser/web_contents/touch_editable_impl_aura.cc b/content/browser/web_contents/touch_editable_impl_aura.cc index d6b3ed9..d782b8c 100644 --- a/content/browser/web_contents/touch_editable_impl_aura.cc +++ b/content/browser/web_contents/touch_editable_impl_aura.cc @@ -4,7 +4,6 @@ #include "content/browser/web_contents/touch_editable_impl_aura.h" -#include "base/command_line.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "content/common/view_messages.h" @@ -16,7 +15,7 @@ #include "ui/aura/window.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/range/range.h" -#include "ui/base/ui_base_switches.h" +#include "ui/base/ui_base_switches_util.h" namespace content { @@ -29,11 +28,8 @@ TouchEditableImplAura::~TouchEditableImplAura() { // static TouchEditableImplAura* TouchEditableImplAura::Create() { -#if defined(OS_CHROMEOS) - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableTouchEditing)) + if (switches::IsTouchEditingEnabled()) return new TouchEditableImplAura(); -#endif return NULL; } diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index b4836b2..2383846 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -182,7 +182,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 @@ 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()) |