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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 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 | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 66d2c0d45daa14ace02dee5f2bdec6516e07ae3f..436193200f65298d91169fb5b4fa87a3aed4719f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -762,6 +762,25 @@ 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;
+ 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")
+ selection_strategy = WebSettings::SelectionStrategyType::Direction;
+ webview()->settings()->setSelectionStrategy(selection_strategy);
+
if (!params.frame_name.empty())
webview()->mainFrame()->setName(params.frame_name);
@@ -3075,10 +3094,6 @@ void RenderViewImpl::DidHandleMouseEvent(const WebMouseEvent& event) {
FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidHandleMouseEvent(event));
}
-void RenderViewImpl::DidHandleTouchEvent(const WebTouchEvent& event) {
- FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidHandleTouchEvent(event));
-}
-
bool RenderViewImpl::HasTouchEventHandlersAt(const gfx::Point& point) const {
if (!webview())
return false;
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698