summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdduke <jdduke@chromium.org>2015-05-13 15:00:03 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-13 22:00:20 +0000
commit9a6cbec6b716f5fc55d1037bf5ae9b7ebd68ac45 (patch)
tree28951370794ef382b585dca38dc131de868e2eab
parent3d8ced8a28bccc7d2f0a62e5a3df0173a1f4b713 (diff)
downloadchromium_src-9a6cbec6b716f5fc55d1037bf5ae9b7ebd68ac45.zip
chromium_src-9a6cbec6b716f5fc55d1037bf5ae9b7ebd68ac45.tar.gz
chromium_src-9a6cbec6b716f5fc55d1037bf5ae9b7ebd68ac45.tar.bz2
[Android] Disable smart selection by default
There are ongoing improvements to smart selection that likely will not land before M44 branch. Disable it for now, avoiding the need to cherry-pick any eventual updates. BUG=451255 Review URL: https://codereview.chromium.org/1135313003 Cr-Commit-Position: refs/heads/master@{#329721}
-rw-r--r--content/renderer/render_view_impl.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 396d14b..48df2c4 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -755,22 +755,12 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
if (switches::IsTouchEditingEnabled())
webview()->settings()->setTouchEditingEnabled(true);
-#if defined(OS_ANDROID)
- WebSettings::SelectionStrategyType selection_strategy_default =
- WebSettings::SelectionStrategyType::Direction;
-#else
- WebSettings::SelectionStrategyType selection_strategy_default =
- WebSettings::SelectionStrategyType::Character;
-#endif
-
WebSettings::SelectionStrategyType selection_strategy =
- selection_strategy_default;
+ WebSettings::SelectionStrategyType::Character;
const std::string selection_strategy_str =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kTouchTextSelectionStrategy);
- if (selection_strategy_str == "character")
- selection_strategy = WebSettings::SelectionStrategyType::Character;
- else if (selection_strategy_str == "direction")
+ if (selection_strategy_str == "direction")
selection_strategy = WebSettings::SelectionStrategyType::Direction;
webview()->settings()->setSelectionStrategy(selection_strategy);