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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 2317333002: Refactor EventHandler out of RenderWidgetHostViewAura (Closed)
Patch Set: Fix popups Created 4 years, 3 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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 17 matching lines...) Expand all
28 #include "content/browser/renderer_host/delegated_frame_host.h" 28 #include "content/browser/renderer_host/delegated_frame_host.h"
29 #include "content/browser/renderer_host/render_widget_host_view_base.h" 29 #include "content/browser/renderer_host/render_widget_host_view_base.h"
30 #include "content/browser/renderer_host/text_input_manager.h" 30 #include "content/browser/renderer_host/text_input_manager.h"
31 #include "content/common/content_export.h" 31 #include "content/common/content_export.h"
32 #include "content/common/cursors/webcursor.h" 32 #include "content/common/cursors/webcursor.h"
33 #include "content/public/common/context_menu_params.h" 33 #include "content/public/common/context_menu_params.h"
34 #include "third_party/skia/include/core/SkRegion.h" 34 #include "third_party/skia/include/core/SkRegion.h"
35 #include "ui/aura/client/cursor_client_observer.h" 35 #include "ui/aura/client/cursor_client_observer.h"
36 #include "ui/aura/client/focus_change_observer.h" 36 #include "ui/aura/client/focus_change_observer.h"
37 #include "ui/aura/window_delegate.h" 37 #include "ui/aura/window_delegate.h"
38 #include "ui/aura/window_tracker.h"
39 #include "ui/aura/window_tree_host_observer.h" 38 #include "ui/aura/window_tree_host_observer.h"
40 #include "ui/base/ime/text_input_client.h" 39 #include "ui/base/ime/text_input_client.h"
41 #include "ui/display/display_observer.h" 40 #include "ui/display/display_observer.h"
42 #include "ui/events/gestures/motion_event_aura.h"
43 #include "ui/gfx/geometry/insets.h" 41 #include "ui/gfx/geometry/insets.h"
44 #include "ui/gfx/geometry/rect.h" 42 #include "ui/gfx/geometry/rect.h"
45 #include "ui/gfx/selection_bound.h" 43 #include "ui/gfx/selection_bound.h"
46 #include "ui/wm/public/activation_delegate.h" 44 #include "ui/wm/public/activation_delegate.h"
47 45
48 namespace aura {
49 namespace client {
50 class ScopedTooltipDisabler;
51 }
52 }
53
54 namespace cc { 46 namespace cc {
55 class CopyOutputRequest; 47 class CopyOutputRequest;
56 class CopyOutputResult; 48 class CopyOutputResult;
57 class DelegatedFrameData; 49 class DelegatedFrameData;
58 } 50 }
59 51
60 namespace gfx { 52 namespace gfx {
61 class Canvas; 53 class Canvas;
62 class Display; 54 class Display;
63 class Point; 55 class Point;
64 class Rect; 56 class Rect;
65 } 57 }
66 58
67 namespace gpu { 59 namespace gpu {
68 struct Mailbox; 60 struct Mailbox;
69 } 61 }
70 62
71 namespace ui { 63 namespace ui {
72 class CompositorLock; 64 class CompositorLock;
73 class InputMethod; 65 class InputMethod;
74 class LocatedEvent; 66 class LocatedEvent;
75 #if defined(OS_WIN) 67 #if defined(OS_WIN)
76 class OnScreenKeyboardObserver; 68 class OnScreenKeyboardObserver;
77 #endif 69 #endif
78 class Texture; 70 class Texture;
79 class TouchSelectionController; 71 class TouchSelectionController;
80 } 72 }
81 73
82 namespace content { 74 namespace content {
75 class RenderWidgetHostViewEventHandler;
83 #if defined(OS_WIN) 76 #if defined(OS_WIN)
84 class LegacyRenderWidgetHostHWND; 77 class LegacyRenderWidgetHostHWND;
85 #endif 78 #endif
86 79
87 class OverscrollController; 80 class OverscrollController;
88 class RenderFrameHostImpl; 81 class RenderFrameHostImpl;
89 class RenderViewHostDelegateView; 82 class RenderViewHostDelegateView;
90 class RenderWidgetHostImpl; 83 class RenderWidgetHostImpl;
91 class RenderWidgetHostView; 84 class RenderWidgetHostView;
92 class TouchSelectionControllerClientAura; 85 class TouchSelectionControllerClientAura;
(...skipping 29 matching lines...) Expand all
122 gfx::NativeView GetNativeView() const override; 115 gfx::NativeView GetNativeView() const override;
123 gfx::NativeViewAccessible GetNativeViewAccessible() override; 116 gfx::NativeViewAccessible GetNativeViewAccessible() override;
124 ui::TextInputClient* GetTextInputClient() override; 117 ui::TextInputClient* GetTextInputClient() override;
125 bool HasFocus() const override; 118 bool HasFocus() const override;
126 bool IsSurfaceAvailableForCopy() const override; 119 bool IsSurfaceAvailableForCopy() const override;
127 void Show() override; 120 void Show() override;
128 void Hide() override; 121 void Hide() override;
129 bool IsShowing() override; 122 bool IsShowing() override;
130 gfx::Rect GetViewBounds() const override; 123 gfx::Rect GetViewBounds() const override;
131 void SetBackgroundColor(SkColor color) override; 124 void SetBackgroundColor(SkColor color) override;
125 bool IsMouseLocked() override;
132 gfx::Size GetVisibleViewportSize() const override; 126 gfx::Size GetVisibleViewportSize() const override;
133 void SetInsets(const gfx::Insets& insets) override; 127 void SetInsets(const gfx::Insets& insets) override;
134 void FocusedNodeTouched(const gfx::Point& location_dips_screen, 128 void FocusedNodeTouched(const gfx::Point& location_dips_screen,
135 bool editable) override; 129 bool editable) override;
136 void SetNeedsBeginFrames(bool needs_begin_frames) override; 130 void SetNeedsBeginFrames(bool needs_begin_frames) override;
137 131
138 // Overridden from RenderWidgetHostViewBase: 132 // Overridden from RenderWidgetHostViewBase:
139 void InitAsPopup(RenderWidgetHostView* parent_host_view, 133 void InitAsPopup(RenderWidgetHostView* parent_host_view,
140 const gfx::Rect& pos) override; 134 const gfx::Rect& pos) override;
141 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; 135 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 bool OnShowContextMenu(const ContextMenuParams& params); 318 bool OnShowContextMenu(const ContextMenuParams& params);
325 319
326 // Used in tests to set a mock client for touch selection controller. It will 320 // Used in tests to set a mock client for touch selection controller. It will
327 // create a new touch selection controller for the new client. 321 // create a new touch selection controller for the new client.
328 void SetSelectionControllerClientForTest( 322 void SetSelectionControllerClientForTest(
329 std::unique_ptr<TouchSelectionControllerClientAura> client); 323 std::unique_ptr<TouchSelectionControllerClientAura> client);
330 324
331 // Exposed for tests. 325 // Exposed for tests.
332 cc::SurfaceId SurfaceIdForTesting() const override; 326 cc::SurfaceId SurfaceIdForTesting() const override;
333 327
328 // Converts |rect| from window coordinate to screen coordinate.
329 gfx::Rect ConvertRectToScreen(const gfx::Rect& rect) const;
330
331 RenderFrameHostImpl* GetFocusedFrame();
332
333 // Before calling RenderWidgetHost::ForwardKeyboardEvent(), this method
334 // calls our keybindings handler against the event and send matched
335 // edit commands to renderer instead.
336 void ForwardKeyboardEvent(const NativeWebKeyboardEvent& event);
337
338 // Returns whether the widget needs to grab mouse capture to work properly.
339 bool NeedsMouseCapture();
340
341 // Sends shutdown request.
342 void Shutdown();
343
344 RenderWidgetHostViewEventHandler* event_handler() {
345 return event_handler_.get();
346 }
347
348 bool is_fullscreen() { return is_fullscreen_; }
349
350 blink::WebPopupType popup_type() { return popup_type_; }
351
334 protected: 352 protected:
335 ~RenderWidgetHostViewAura() override; 353 ~RenderWidgetHostViewAura() override;
336 354
337 // Exposed for tests. 355 // Exposed for tests.
338 aura::Window* window() { return window_; } 356 aura::Window* window() { return window_; }
339 357
340 DelegatedFrameHost* GetDelegatedFrameHost() const { 358 DelegatedFrameHost* GetDelegatedFrameHost() const {
341 return delegated_frame_host_.get(); 359 return delegated_frame_host_.get();
342 } 360 }
343 361
344 const ui::MotionEventAura& pointer_state() const { return pointer_state_; }
345
346 private: 362 private:
347 friend class InputMethodAuraTestBase; 363 friend class InputMethodAuraTestBase;
348 friend class RenderWidgetHostViewAuraCopyRequestTest; 364 friend class RenderWidgetHostViewAuraCopyRequestTest;
349 friend class TestInputMethodObserver; 365 friend class TestInputMethodObserver;
350 FRIEND_TEST_ALL_PREFIXES(InputMethodResultAuraTest, 366 FRIEND_TEST_ALL_PREFIXES(InputMethodResultAuraTest,
351 FinishImeCompositionSession); 367 FinishImeCompositionSession);
352 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 368 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
353 PopupRetainsCaptureAfterMouseRelease); 369 PopupRetainsCaptureAfterMouseRelease);
354 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); 370 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
355 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); 371 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // Creates and/or updates the legacy dummy window which corresponds to 417 // Creates and/or updates the legacy dummy window which corresponds to
402 // the bounds of the webcontents. It is needed for accessibility and 418 // the bounds of the webcontents. It is needed for accessibility and
403 // for scrolling to work in legacy drivers for trackpoints/trackpads, etc. 419 // for scrolling to work in legacy drivers for trackpoints/trackpads, etc.
404 void UpdateLegacyWin(); 420 void UpdateLegacyWin();
405 421
406 bool UsesNativeWindowFrame() const; 422 bool UsesNativeWindowFrame() const;
407 #endif 423 #endif
408 424
409 ui::InputMethod* GetInputMethod() const; 425 ui::InputMethod* GetInputMethod() const;
410 426
411 // Sends shutdown request.
412 void Shutdown();
413
414 // Returns whether the widget needs an input grab to work properly. 427 // Returns whether the widget needs an input grab to work properly.
415 bool NeedsInputGrab(); 428 bool NeedsInputGrab();
416 429
417 // Returns whether the widget needs to grab mouse capture to work properly.
418 bool NeedsMouseCapture();
419
420 // Confirm existing composition text in the webpage and ask the input method
421 // to cancel its ongoing composition session.
422 void FinishImeCompositionSession();
423
424 // This method computes movementX/Y and keeps track of mouse location for
425 // mouse lock on all mouse move events.
426 void ModifyEventMovementAndCoords(blink::WebMouseEvent* event);
427
428 // Sends an IPC to the renderer process to communicate whether or not 430 // Sends an IPC to the renderer process to communicate whether or not
429 // the mouse cursor is visible anywhere on the screen. 431 // the mouse cursor is visible anywhere on the screen.
430 void NotifyRendererOfCursorVisibilityState(bool is_visible); 432 void NotifyRendererOfCursorVisibilityState(bool is_visible);
431 433
432 // If |clip| is non-empty and and doesn't contain |rect| or |clip| is empty 434 // If |clip| is non-empty and and doesn't contain |rect| or |clip| is empty
433 // SchedulePaint() is invoked for |rect|. 435 // SchedulePaint() is invoked for |rect|.
434 void SchedulePaintIfNotInClip(const gfx::Rect& rect, const gfx::Rect& clip); 436 void SchedulePaintIfNotInClip(const gfx::Rect& rect, const gfx::Rect& clip);
435 437
436 // Helper method to determine if, in mouse locked mode, the cursor should be
437 // moved to center.
438 bool ShouldMoveToCenter();
439
440 // Called after |window_| is parented to a WindowEventDispatcher. 438 // Called after |window_| is parented to a WindowEventDispatcher.
441 void AddedToRootWindow(); 439 void AddedToRootWindow();
442 440
443 // Called prior to removing |window_| from a WindowEventDispatcher. 441 // Called prior to removing |window_| from a WindowEventDispatcher.
444 void RemovingFromRootWindow(); 442 void RemovingFromRootWindow();
445 443
446 // DelegatedFrameHostClient implementation. 444 // DelegatedFrameHostClient implementation.
447 ui::Layer* DelegatedFrameHostGetLayer() const override; 445 ui::Layer* DelegatedFrameHostGetLayer() const override;
448 bool DelegatedFrameHostIsVisible() const override; 446 bool DelegatedFrameHostIsVisible() const override;
449 SkColor DelegatedFrameHostGetGutterColor(SkColor color) const override; 447 SkColor DelegatedFrameHostGetGutterColor(SkColor color) const override;
(...skipping 23 matching lines...) Expand all
473 RenderWidgetHostViewBase* updated_view) override; 471 RenderWidgetHostViewBase* updated_view) override;
474 472
475 // cc::BeginFrameObserver implementation. 473 // cc::BeginFrameObserver implementation.
476 void OnBeginFrame(const cc::BeginFrameArgs& args) override; 474 void OnBeginFrame(const cc::BeginFrameArgs& args) override;
477 const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override; 475 const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
478 void OnBeginFrameSourcePausedChanged(bool paused) override; 476 void OnBeginFrameSourcePausedChanged(bool paused) override;
479 477
480 // Detaches |this| from the input method object. 478 // Detaches |this| from the input method object.
481 void DetachFromInputMethod(); 479 void DetachFromInputMethod();
482 480
483 // Before calling RenderWidgetHost::ForwardKeyboardEvent(), this method
484 // calls our keybindings handler against the event and send matched
485 // edit commands to renderer instead.
486 void ForwardKeyboardEvent(const NativeWebKeyboardEvent& event);
487
488 // Dismisses a Web Popup on a mouse or touch press outside the popup and its 481 // Dismisses a Web Popup on a mouse or touch press outside the popup and its
489 // parent. 482 // parent.
490 void ApplyEventFilterForPopupExit(ui::LocatedEvent* event); 483 void ApplyEventFilterForPopupExit(ui::LocatedEvent* event);
491 484
492 // Converts |rect| from window coordinate to screen coordinate.
493 gfx::Rect ConvertRectToScreen(const gfx::Rect& rect) const;
494
495 // Converts |rect| from screen coordinate to window coordinate. 485 // Converts |rect| from screen coordinate to window coordinate.
496 gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const; 486 gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const;
497 487
498 // Helper function to set keyboard focus to the main window.
499 void SetKeyboardFocus();
500
501 RenderFrameHostImpl* GetFocusedFrame();
502
503 // Returns true if the |event| passed in can be forwarded to the renderer.
504 bool CanRendererHandleEvent(const ui::MouseEvent* event,
505 bool mouse_locked,
506 bool selection_popup) const;
507
508 // Returns true when we can do SurfaceHitTesting for the event type.
509 bool ShouldRouteEvent(const ui::Event* event) const;
510
511 // Called when the parent window bounds change. 488 // Called when the parent window bounds change.
512 void HandleParentBoundsChanged(); 489 void HandleParentBoundsChanged();
513 490
514 // Called when the parent window hierarchy for our window changes. 491 // Called when the parent window hierarchy for our window changes.
515 void ParentHierarchyChanged(); 492 void ParentHierarchyChanged();
516 493
517 // Helper function to be called whenever new selection information is 494 // Helper function to be called whenever new selection information is
518 // received. It will update selection controller. 495 // received. It will update selection controller.
519 void SelectionUpdated(bool is_editable, 496 void SelectionUpdated(bool is_editable,
520 bool is_empty_text_form_control, 497 bool is_empty_text_form_control,
521 const gfx::SelectionBound& start, 498 const gfx::SelectionBound& start,
522 const gfx::SelectionBound& end); 499 const gfx::SelectionBound& end);
523 500
524 // Helper function to create a selection controller. 501 // Helper function to create a selection controller.
525 void CreateSelectionController(); 502 void CreateSelectionController();
526 503
527 // Performs gesture handling needed for touch text selection. Sets event as 504 // Used to set the |popup_child_host_view_| on the |popup_parent_host_view_|
528 // handled if it should not be further processed. 505 // and to notify the |event_handler_|.
529 void HandleGestureForTouchSelection(ui::GestureEvent* event); 506 void SetPopupChildHostView(RenderWidgetHostViewAura* popup_child_host_view);
530
531 // Forwards a mouse event to this view's parent window delegate.
532 void ForwardMouseEventToParent(ui::MouseEvent* event);
533
534 // Returns the RenderViewHostDelegateView instance for this view. Returns
535 // NULL on failure.
536 RenderViewHostDelegateView* GetRenderViewHostDelegateView();
537 507
538 // The model object. 508 // The model object.
539 RenderWidgetHostImpl* const host_; 509 RenderWidgetHostImpl* const host_;
540 510
541 aura::Window* window_; 511 aura::Window* window_;
542 512
543 std::unique_ptr<DelegatedFrameHost> delegated_frame_host_; 513 std::unique_ptr<DelegatedFrameHost> delegated_frame_host_;
544 514
545 std::unique_ptr<WindowObserver> window_observer_; 515 std::unique_ptr<WindowObserver> window_observer_;
546 516
(...skipping 20 matching lines...) Expand all
567 class EventFilterForPopupExit; 537 class EventFilterForPopupExit;
568 friend class EventFilterForPopupExit; 538 friend class EventFilterForPopupExit;
569 std::unique_ptr<ui::EventHandler> event_filter_for_popup_exit_; 539 std::unique_ptr<ui::EventHandler> event_filter_for_popup_exit_;
570 540
571 // True when content is being loaded. Used to show an hourglass cursor. 541 // True when content is being loaded. Used to show an hourglass cursor.
572 bool is_loading_; 542 bool is_loading_;
573 543
574 // The cursor for the page. This is passed up from the renderer. 544 // The cursor for the page. This is passed up from the renderer.
575 WebCursor current_cursor_; 545 WebCursor current_cursor_;
576 546
577 // Stores the current state of the active pointers targeting this
578 // object.
579 ui::MotionEventAura pointer_state_;
580
581
582 // Indicates if there is onging composition text. 547 // Indicates if there is onging composition text.
583 bool has_composition_text_; 548 bool has_composition_text_;
584 549
585 // Whether return characters should be passed on to the RenderWidgetHostImpl.
586 bool accept_return_character_;
587
588 // Current tooltip text. 550 // Current tooltip text.
589 base::string16 tooltip_; 551 base::string16 tooltip_;
590 552
591 // The begin frame source being observed. Null if none. 553 // The begin frame source being observed. Null if none.
592 cc::BeginFrameSource* begin_frame_source_; 554 cc::BeginFrameSource* begin_frame_source_;
593 cc::BeginFrameArgs last_begin_frame_args_; 555 cc::BeginFrameArgs last_begin_frame_args_;
594 bool needs_begin_frames_; 556 bool needs_begin_frames_;
595 557
596 // Used to record the last position of the mouse.
597 // While the mouse is locked, they store the last known position just as mouse
598 // lock was entered.
599 // Relative to the upper-left corner of the view.
600 gfx::Point unlocked_mouse_position_;
601 // Relative to the upper-left corner of the screen.
602 gfx::Point unlocked_global_mouse_position_;
603 // Last cursor position relative to screen. Used to compute movementX/Y.
604 gfx::Point global_mouse_position_;
605 // In mouse locked mode, we synthetically move the mouse cursor to the center
606 // of the window when it reaches the window borders to avoid it going outside.
607 // This flag is used to differentiate between these synthetic mouse move
608 // events vs. normal mouse move events.
609 bool synthetic_move_sent_;
610
611 // Used to track the state of the window we're created from. Only used when
612 // created fullscreen.
613 std::unique_ptr<aura::WindowTracker> host_tracker_;
614
615 // Used to track the last cursor visibility update that was sent to the 558 // Used to track the last cursor visibility update that was sent to the
616 // renderer via NotifyRendererOfCursorVisibilityState(). 559 // renderer via NotifyRendererOfCursorVisibilityState().
617 enum CursorVisibilityState { 560 enum CursorVisibilityState {
618 UNKNOWN, 561 UNKNOWN,
619 VISIBLE, 562 VISIBLE,
620 NOT_VISIBLE, 563 NOT_VISIBLE,
621 }; 564 };
622 CursorVisibilityState cursor_visibility_state_in_renderer_; 565 CursorVisibilityState cursor_visibility_state_in_renderer_;
623 566
624 #if defined(OS_WIN) 567 #if defined(OS_WIN)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 599
657 std::unique_ptr<OverscrollController> overscroll_controller_; 600 std::unique_ptr<OverscrollController> overscroll_controller_;
658 601
659 // The last scroll offset of the view. 602 // The last scroll offset of the view.
660 gfx::Vector2dF last_scroll_offset_; 603 gfx::Vector2dF last_scroll_offset_;
661 604
662 gfx::Insets insets_; 605 gfx::Insets insets_;
663 606
664 std::vector<ui::LatencyInfo> software_latency_info_; 607 std::vector<ui::LatencyInfo> software_latency_info_;
665 608
666 std::unique_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
667
668 // True when this view acts as a platform view hack for a 609 // True when this view acts as a platform view hack for a
669 // RenderWidgetHostViewGuest. 610 // RenderWidgetHostViewGuest.
670 bool is_guest_view_hack_; 611 bool is_guest_view_hack_;
671 612
672 // This flag when set ensures that we send over a notification to blink that
673 // the current view has focus. Defaults to false.
674 bool set_focus_on_mouse_down_or_key_event_;
675
676 float device_scale_factor_; 613 float device_scale_factor_;
677 614
678 // Allows tests to send gesture events for testing without first sending a
679 // corresponding touch sequence, as would be required by
680 // RenderWidgetHostInputEventRouter.
681 bool disable_input_event_router_for_testing_;
682
683 // The routing and process IDs for the last RenderWidgetHost which had a 615 // The routing and process IDs for the last RenderWidgetHost which had a
684 // TextInputState of non-NONE. 616 // TextInputState of non-NONE.
685 int32_t last_active_widget_process_id_; 617 int32_t last_active_widget_process_id_;
686 int32_t last_active_widget_routing_id_; 618 int32_t last_active_widget_routing_id_;
687 619
620 // While this is an ui::EventHandler for targetting, |event_handler_| actually
621 // provides an implementation, and directs events to |host_|.
622 std::unique_ptr<RenderWidgetHostViewEventHandler> event_handler_;
623
688 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 624 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
689 625
690 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 626 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
691 }; 627 };
692 628
693 } // namespace content 629 } // namespace content
694 630
695 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 631 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698