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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 351683002: Adds link disambiguation popup support to Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed scrolling cruft Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void PrepareOverscrollNavigationOverlay(); 95 void PrepareOverscrollNavigationOverlay();
96 96
97 // Changes the brightness of the layer depending on the amount of horizontal 97 // Changes the brightness of the layer depending on the amount of horizontal
98 // overscroll (|delta_x|, in pixels). 98 // overscroll (|delta_x|, in pixels).
99 void UpdateOverscrollWindowBrightness(float delta_x); 99 void UpdateOverscrollWindowBrightness(float delta_x);
100 100
101 void AttachTouchEditableToRenderView(); 101 void AttachTouchEditableToRenderView();
102 102
103 void OverscrollUpdateForWebContentsDelegate(int delta_y); 103 void OverscrollUpdateForWebContentsDelegate(int delta_y);
104 104
105 #if defined(OS_WIN)
sky 2014/08/04 20:05:20 No ifdefs here.
luken 2014/09/11 01:07:28 Done.
106 void ProcessLinkDisambiguationGesture(ui::GestureEvent* event);
107 #endif
108
105 // Overridden from WebContentsView: 109 // Overridden from WebContentsView:
106 virtual gfx::NativeView GetNativeView() const OVERRIDE; 110 virtual gfx::NativeView GetNativeView() const OVERRIDE;
107 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 111 virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
108 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 112 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
109 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE; 113 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE;
110 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 114 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
111 virtual void Focus() OVERRIDE; 115 virtual void Focus() OVERRIDE;
112 virtual void SetInitialFocus() OVERRIDE; 116 virtual void SetInitialFocus() OVERRIDE;
113 virtual void StoreFocus() OVERRIDE; 117 virtual void StoreFocus() OVERRIDE;
114 virtual void RestoreFocus() OVERRIDE; 118 virtual void RestoreFocus() OVERRIDE;
(...skipping 14 matching lines...) Expand all
129 virtual void ShowContextMenu(RenderFrameHost* render_frame_host, 133 virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
130 const ContextMenuParams& params) OVERRIDE; 134 const ContextMenuParams& params) OVERRIDE;
131 virtual void StartDragging(const DropData& drop_data, 135 virtual void StartDragging(const DropData& drop_data,
132 blink::WebDragOperationsMask operations, 136 blink::WebDragOperationsMask operations,
133 const gfx::ImageSkia& image, 137 const gfx::ImageSkia& image,
134 const gfx::Vector2d& image_offset, 138 const gfx::Vector2d& image_offset,
135 const DragEventSourceInfo& event_info) OVERRIDE; 139 const DragEventSourceInfo& event_info) OVERRIDE;
136 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; 140 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
137 virtual void GotFocus() OVERRIDE; 141 virtual void GotFocus() OVERRIDE;
138 virtual void TakeFocus(bool reverse) OVERRIDE; 142 virtual void TakeFocus(bool reverse) OVERRIDE;
143 #if defined(OS_WIN)
sky 2014/08/04 20:05:20 No ifdefs here.
luken 2014/09/11 01:07:28 Done.
144 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect,
145 const SkBitmap& zoomed_bitmap) OVERRIDE;
146 virtual void HideDisambiguationPopup() OVERRIDE;
147 #endif
139 148
140 // Overridden from OverscrollControllerDelegate: 149 // Overridden from OverscrollControllerDelegate:
141 virtual gfx::Rect GetVisibleBounds() const OVERRIDE; 150 virtual gfx::Rect GetVisibleBounds() const OVERRIDE;
142 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; 151 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE;
143 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; 152 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE;
144 virtual void OnOverscrollModeChange(OverscrollMode old_mode, 153 virtual void OnOverscrollModeChange(OverscrollMode old_mode,
145 OverscrollMode new_mode) OVERRIDE; 154 OverscrollMode new_mode) OVERRIDE;
146 155
147 // Overridden from ui::ImplicitAnimationObserver: 156 // Overridden from ui::ImplicitAnimationObserver:
148 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 157 virtual void OnImplicitAnimationsCompleted() OVERRIDE;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // On Windows we can run into problems if resources get released within the 241 // On Windows we can run into problems if resources get released within the
233 // initialization phase while the content (and its dimensions) are not known. 242 // initialization phase while the content (and its dimensions) are not known.
234 bool is_or_was_visible_; 243 bool is_or_was_visible_;
235 244
236 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 245 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
237 }; 246 };
238 247
239 } // namespace content 248 } // namespace content
240 249
241 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 250 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698