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

Unified Diff: content/browser/renderer_host/input/touch_selection_controller_client_aura.h

Issue 1263703004: Revert of Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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: content/browser/renderer_host/input/touch_selection_controller_client_aura.h
diff --git a/content/browser/renderer_host/input/touch_selection_controller_client_aura.h b/content/browser/renderer_host/input/touch_selection_controller_client_aura.h
deleted file mode 100644
index bb9dd6665f626340cd11ed76c5746407fc2caf20..0000000000000000000000000000000000000000
--- a/content/browser/renderer_host/input/touch_selection_controller_client_aura.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_CLIENT_AURA_H_
-#define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_CLIENT_AURA_H_
-
-#include "base/timer/timer.h"
-#include "content/common/content_export.h"
-#include "ui/touch_selection/touch_selection_controller.h"
-#include "ui/touch_selection/touch_selection_menu_runner.h"
-
-namespace content {
-class RenderWidgetHostViewAura;
-
-// An implementation of |TouchSelectionControllerClient| to be used in Aura's
-// implementation of touch selection for contents.
-class CONTENT_EXPORT TouchSelectionControllerClientAura
- : public ui::TouchSelectionControllerClient,
- public ui::TouchSelectionMenuClient {
- public:
- explicit TouchSelectionControllerClientAura(RenderWidgetHostViewAura* rwhva);
- ~TouchSelectionControllerClientAura() override;
-
- // Called when |rwhva_|'s window is moved, to update the quick menu's
- // position.
- void OnWindowMoved();
-
- // Called on first touch down/last touch up to hide/show the quick menu.
- void OnTouchDown();
- void OnTouchUp();
-
- // Called when touch scroll starts/completes to hide/show touch handles and
- // the quick menu.
- void OnScrollStarted();
- void OnScrollCompleted();
-
- private:
- friend class TestTouchSelectionControllerClientAura;
- class EnvPreTargetHandler;
-
- bool IsQuickMenuAllowed() const;
- void ShowQuickMenu();
- void UpdateQuickMenu();
-
- // ui::TouchSelectionControllerClient:
- bool SupportsAnimation() const override;
- void SetNeedsAnimate() override;
- void MoveCaret(const gfx::PointF& position) override;
- void MoveRangeSelectionExtent(const gfx::PointF& extent) override;
- void SelectBetweenCoordinates(const gfx::PointF& base,
- const gfx::PointF& extent) override;
- void OnSelectionEvent(ui::SelectionEventType event) override;
- scoped_ptr<ui::TouchHandleDrawable> CreateDrawable() override;
-
- // ui::TouchSelectionMenuClient:
- bool IsCommandIdEnabled(int command_id) const override;
- void ExecuteCommand(int command_id, int event_flags) override;
- void RunContextMenu() override;
-
- // Not owned, non-null for the lifetime of this object.
- RenderWidgetHostViewAura* rwhva_;
-
- base::Timer quick_menu_timer_;
- bool touch_down_;
- bool scroll_in_progress_;
- bool handle_drag_in_progress_;
-
- bool show_quick_menu_immediately_for_test_;
-
- // A pre-target event handler for aura::Env which deactivates touch selection
- // on mouse and keyboard events.
- scoped_ptr<EnvPreTargetHandler> env_pre_target_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerClientAura);
-};
-
-} // namespace content
-
-#endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_CLIENT_AURA_H_
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/input/touch_selection_controller_client_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698