diff options
| author | creis <creis@chromium.org> | 2014-09-19 14:10:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 21:11:08 +0000 |
| commit | 2ea692ffc1f83dde364ece4fd608d8817825fc2b (patch) | |
| tree | 5f65d76ba456552a62bcabd1220d85f306ee4745 /content | |
| parent | 8586447fee9831dd674c9b8af24dea95d469d147 (diff) | |
| download | chromium_src-2ea692ffc1f83dde364ece4fd608d8817825fc2b.zip chromium_src-2ea692ffc1f83dde364ece4fd608d8817825fc2b.tar.gz chromium_src-2ea692ffc1f83dde364ece4fd608d8817825fc2b.tar.bz2 | |
Move RFH's WeakPtrFactory to be the last member.
BUG=none
Review URL: https://codereview.chromium.org/589653002
Cr-Commit-Position: refs/heads/master@{#295777}
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/frame_host/render_frame_host_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h index 67b4a41..da308b10 100644 --- a/content/browser/frame_host/render_frame_host_impl.h +++ b/content/browser/frame_host/render_frame_host_impl.h @@ -479,8 +479,6 @@ class CONTENT_EXPORT RenderFrameHostImpl ServiceRegistryImpl service_registry_; - base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; - scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_; // Callback when an event is received, for testing. @@ -488,6 +486,9 @@ class CONTENT_EXPORT RenderFrameHostImpl // The most recently received accessibility tree - for testing only. scoped_ptr<ui::AXTree> ax_tree_for_testing_; + // NOTE: This must be the last member. + base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; + DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); }; |