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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 982ef2599cce7940db1a549925b30fc13e39df29..3682c5f596d6b633b26ce95c2391ddbbd28d87d1 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -86,8 +86,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
public aura::client::ActivationDelegate,
public aura::client::ActivationChangeObserver,
public aura::client::FocusChangeObserver,
- public aura::client::CursorClientObserver,
- public base::SupportsWeakPtr<RenderWidgetHostViewAura> {
+ public aura::client::CursorClientObserver {
public:
// Displays and controls touch editing elements such as selection handles.
class TouchEditingClient {
@@ -618,8 +617,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
// RenderWidgetHostViewGuest.
bool is_guest_view_hack_;
- base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
-
gfx::Rect disambiguation_target_rect_;
// The last scroll offset when we start to render the link disambiguation
@@ -627,6 +624,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
// compositing surface and showing the disambiguation popup.
gfx::Vector2dF disambiguation_scroll_offset_;
+ base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
};
« 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