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

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

Issue 737353003: Fix WeakPtrFactory member ordering in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved typo Created 6 years, 1 month 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 class CONTENT_EXPORT RenderWidgetHostViewAura 79 class CONTENT_EXPORT RenderWidgetHostViewAura
80 : public RenderWidgetHostViewBase, 80 : public RenderWidgetHostViewBase,
81 public DelegatedFrameHostClient, 81 public DelegatedFrameHostClient,
82 public ui::TextInputClient, 82 public ui::TextInputClient,
83 public gfx::DisplayObserver, 83 public gfx::DisplayObserver,
84 public aura::WindowTreeHostObserver, 84 public aura::WindowTreeHostObserver,
85 public aura::WindowDelegate, 85 public aura::WindowDelegate,
86 public aura::client::ActivationDelegate, 86 public aura::client::ActivationDelegate,
87 public aura::client::ActivationChangeObserver, 87 public aura::client::ActivationChangeObserver,
88 public aura::client::FocusChangeObserver, 88 public aura::client::FocusChangeObserver,
89 public aura::client::CursorClientObserver, 89 public aura::client::CursorClientObserver {
90 public base::SupportsWeakPtr<RenderWidgetHostViewAura> {
91 public: 90 public:
92 // Displays and controls touch editing elements such as selection handles. 91 // Displays and controls touch editing elements such as selection handles.
93 class TouchEditingClient { 92 class TouchEditingClient {
94 public: 93 public:
95 TouchEditingClient() {} 94 TouchEditingClient() {}
96 95
97 // Tells the client to start showing touch editing handles. 96 // Tells the client to start showing touch editing handles.
98 virtual void StartTouchEditing() = 0; 97 virtual void StartTouchEditing() = 0;
99 98
100 // Notifies the client that touch editing is no longer needed. |quick| 99 // Notifies the client that touch editing is no longer needed. |quick|
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 gfx::Insets insets_; 610 gfx::Insets insets_;
612 611
613 std::vector<ui::LatencyInfo> software_latency_info_; 612 std::vector<ui::LatencyInfo> software_latency_info_;
614 613
615 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; 614 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
616 615
617 // True when this view acts as a platform view hack for a 616 // True when this view acts as a platform view hack for a
618 // RenderWidgetHostViewGuest. 617 // RenderWidgetHostViewGuest.
619 bool is_guest_view_hack_; 618 bool is_guest_view_hack_;
620 619
621 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
622
623 gfx::Rect disambiguation_target_rect_; 620 gfx::Rect disambiguation_target_rect_;
624 621
625 // The last scroll offset when we start to render the link disambiguation 622 // The last scroll offset when we start to render the link disambiguation
626 // view, so we can ensure the window hasn't moved between copying from the 623 // view, so we can ensure the window hasn't moved between copying from the
627 // compositing surface and showing the disambiguation popup. 624 // compositing surface and showing the disambiguation popup.
628 gfx::Vector2dF disambiguation_scroll_offset_; 625 gfx::Vector2dF disambiguation_scroll_offset_;
629 626
627 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
630 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 628 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
631 }; 629 };
632 630
633 } // namespace content 631 } // namespace content
634 632
635 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 633 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698