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

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

Issue 1926173002: Erase LinkDisambiguation code on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another merge conflict Created 4 years, 7 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 <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 void ShowContextMenu(RenderFrameHost* render_frame_host, 106 void ShowContextMenu(RenderFrameHost* render_frame_host,
107 const ContextMenuParams& params) override; 107 const ContextMenuParams& params) override;
108 void StartDragging(const DropData& drop_data, 108 void StartDragging(const DropData& drop_data,
109 blink::WebDragOperationsMask operations, 109 blink::WebDragOperationsMask operations,
110 const gfx::ImageSkia& image, 110 const gfx::ImageSkia& image,
111 const gfx::Vector2d& image_offset, 111 const gfx::Vector2d& image_offset,
112 const DragEventSourceInfo& event_info) override; 112 const DragEventSourceInfo& event_info) override;
113 void UpdateDragCursor(blink::WebDragOperation operation) override; 113 void UpdateDragCursor(blink::WebDragOperation operation) override;
114 void GotFocus() override; 114 void GotFocus() override;
115 void TakeFocus(bool reverse) override; 115 void TakeFocus(bool reverse) override;
116 void ShowDisambiguationPopup(
117 const gfx::Rect& target_rect,
118 const SkBitmap& zoomed_bitmap,
119 const base::Callback<void(ui::GestureEvent*)>& gesture_cb,
120 const base::Callback<void(ui::MouseEvent*)>& mouse_cb) override;
121 void HideDisambiguationPopup() override;
122 116
123 // Overridden from OverscrollControllerDelegate: 117 // Overridden from OverscrollControllerDelegate:
124 gfx::Rect GetVisibleBounds() const override; 118 gfx::Rect GetVisibleBounds() const override;
125 bool OnOverscrollUpdate(float delta_x, float delta_y) override; 119 bool OnOverscrollUpdate(float delta_x, float delta_y) override;
126 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; 120 void OnOverscrollComplete(OverscrollMode overscroll_mode) override;
127 void OnOverscrollModeChange(OverscrollMode old_mode, 121 void OnOverscrollModeChange(OverscrollMode old_mode,
128 OverscrollMode new_mode) override; 122 OverscrollMode new_mode) override;
129 123
130 // Overridden from aura::WindowDelegate: 124 // Overridden from aura::WindowDelegate:
131 gfx::Size GetMinimumSize() const override; 125 gfx::Size GetMinimumSize() const override;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 std::unique_ptr<OverscrollNavigationOverlay> navigation_overlay_; 189 std::unique_ptr<OverscrollNavigationOverlay> navigation_overlay_;
196 190
197 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; 191 std::unique_ptr<GestureNavSimple> gesture_nav_simple_;
198 192
199 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 193 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
200 }; 194 };
201 195
202 } // namespace content 196 } // namespace content
203 197
204 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 198 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698