| OLD | NEW |
| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 | 196 |
| 197 // We keep track of the RenderWidgetHost we're dragging over. If it changes | 197 // We keep track of the RenderWidgetHost we're dragging over. If it changes |
| 198 // during a drag, we need to re-send the DragEnter message. | 198 // during a drag, we need to re-send the DragEnter message. |
| 199 base::WeakPtr<RenderWidgetHostImpl> current_rwh_for_drag_; | 199 base::WeakPtr<RenderWidgetHostImpl> current_rwh_for_drag_; |
| 200 | 200 |
| 201 // We also keep track of the RenderViewHost we're dragging over to avoid | 201 // We also keep track of the RenderViewHost we're dragging over to avoid |
| 202 // sending the drag exited message after leaving the current | 202 // sending the drag exited message after leaving the current |
| 203 // view. |current_rvh_for_drag_| should not be dereferenced. | 203 // view. |current_rvh_for_drag_| should not be dereferenced. |
| 204 void* current_rvh_for_drag_; | 204 void* current_rvh_for_drag_; |
| 205 | 205 |
| 206 // We track the source RenderProcessHost and RenderViewHost from which the |
| 207 // current drag originated. These are used to ensure that drag events do not |
| 208 // fire over a cross-site frame in the same page (with respect to the source |
| 209 // frame). See crbug.com/666858. |drag_source_rph_| and |drag_source_rvh_| |
| 210 // should not be dereferenced. |
| 211 void* drag_source_rph_; |
| 212 void* drag_source_rvh_; |
| 213 |
| 206 // The overscroll gesture currently in progress. | 214 // The overscroll gesture currently in progress. |
| 207 OverscrollMode current_overscroll_gesture_; | 215 OverscrollMode current_overscroll_gesture_; |
| 208 | 216 |
| 209 // This is the completed overscroll gesture. This is used for the animation | 217 // This is the completed overscroll gesture. This is used for the animation |
| 210 // callback that happens in response to a completed overscroll gesture. | 218 // callback that happens in response to a completed overscroll gesture. |
| 211 OverscrollMode completed_overscroll_gesture_; | 219 OverscrollMode completed_overscroll_gesture_; |
| 212 | 220 |
| 213 // This manages the overlay window that shows the screenshot during a history | 221 // This manages the overlay window that shows the screenshot during a history |
| 214 // navigation triggered by the overscroll gesture. | 222 // navigation triggered by the overscroll gesture. |
| 215 std::unique_ptr<OverscrollNavigationOverlay> navigation_overlay_; | 223 std::unique_ptr<OverscrollNavigationOverlay> navigation_overlay_; |
| 216 | 224 |
| 217 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; | 225 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; |
| 218 | 226 |
| 219 bool init_rwhv_with_null_parent_for_testing_; | 227 bool init_rwhv_with_null_parent_for_testing_; |
| 220 | 228 |
| 221 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 229 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 222 }; | 230 }; |
| 223 | 231 |
| 224 } // namespace content | 232 } // namespace content |
| 225 | 233 |
| 226 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 234 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |