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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 7584021: Revert 95698 - Implement touch selection for RWHVV. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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
Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_views.cc (revision 95703)
+++ chrome/browser/renderer_host/render_widget_host_view_views.cc (working copy)
@@ -87,9 +87,7 @@
visually_deemphasized_(false),
touch_event_(),
text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
- has_composition_text_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
- views::TouchSelectionController::create(this))) {
+ has_composition_text_(false) {
set_focusable(true);
host_->SetView(this);
@@ -306,13 +304,9 @@
}
void RenderWidgetHostViewViews::SelectionChanged(const std::string& text,
- const ui::Range& range,
- const gfx::Point& start,
- const gfx::Point& end) {
+ const ui::Range& range) {
// TODO(anicolao): deal with the clipboard without GTK
NOTIMPLEMENTED();
- if (touch_selection_controller_.get())
- touch_selection_controller_->SelectionChanged(start, end);
}
void RenderWidgetHostViewViews::ShowingContextMenu(bool showing) {
@@ -335,34 +329,6 @@
// TODO(anicolao)
}
-void RenderWidgetHostViewViews::SelectRect(const gfx::Point& start,
- const gfx::Point& end) {
- if (host_)
- host_->Send(new ViewMsg_SelectRange(host_->routing_id(), start, end));
-}
-
-bool RenderWidgetHostViewViews::IsCommandIdChecked(int command_id) const {
- // TODO(varunjain): implement this and other menu delegate methods.
- NOTREACHED();
- return true;
-}
-
-bool RenderWidgetHostViewViews::IsCommandIdEnabled(int command_id) const {
- NOTREACHED();
- return true;
-}
-
-bool RenderWidgetHostViewViews::GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) {
- NOTREACHED();
- return true;
-}
-
-void RenderWidgetHostViewViews::ExecuteCommand(int command_id) {
- NOTREACHED();
-}
-
std::string RenderWidgetHostViewViews::GetClassName() const {
return kViewClassName;
}
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.h ('k') | content/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698