diff options
Diffstat (limited to 'chrome/browser/instant/instant_controller.h')
-rw-r--r-- | chrome/browser/instant/instant_controller.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h index 8f2a844..b6ad248 100644 --- a/chrome/browser/instant/instant_controller.h +++ b/chrome/browser/instant/instant_controller.h @@ -128,15 +128,14 @@ class InstantController : public InstantLoaderDelegate { // Returns false if there is no instant preview showing. bool CommitIfCurrent(); - // Sets InstantController so that when the mouse is released the preview is - // committed. - void SetCommitOnMouseUp(); + // Sets InstantController so that when the mouse is released or the + // touch-gesture ends, the preview is committed. + void SetCommitOnPointerRelease(); - bool commit_on_mouse_up() const { return commit_on_mouse_up_; } + bool commit_on_pointer_release() const { return commit_on_pointer_release_; } - // Returns true if the mouse is down as the result of activating the preview - // content. - bool IsMouseDownFromActivate(); + // Calls through to method of same name on loader. + bool IsPointerDownFromActivate(); // The autocomplete edit that was initiating the current instant session has // lost focus. Commit or discard the preview accordingly. @@ -179,7 +178,7 @@ class InstantController : public InstantLoaderDelegate { const string16& text, InstantCompleteBehavior behavior) OVERRIDE; virtual gfx::Rect GetInstantBounds() OVERRIDE; - virtual bool ShouldCommitInstantOnMouseUp() OVERRIDE; + virtual bool ShouldCommitInstantOnPointerRelease() OVERRIDE; virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE; virtual void InstantLoaderDoesntSupportInstant( InstantLoader* loader) OVERRIDE; @@ -243,8 +242,8 @@ class InstantController : public InstantLoaderDelegate { // See description above setter. gfx::Rect omnibox_bounds_; - // See description above CommitOnMouseUp. - bool commit_on_mouse_up_; + // See descritopn above for SetCommitOnPointerRelease. + bool commit_on_pointer_release_; // See description above getter. content::PageTransition last_transition_type_; |