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

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

Issue 567923002: Refactoring the weak_ptr_factory order in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 // long to execute, depending on the number of active views in the 519 // long to execute, depending on the number of active views in the
520 // SiteInstance. 520 // SiteInstance.
521 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. 521 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state.
522 scoped_ptr<TimeoutMonitor> unload_event_monitor_timeout_; 522 scoped_ptr<TimeoutMonitor> unload_event_monitor_timeout_;
523 523
524 // Called after receiving the SwapOutACK when the RVH is in state pending 524 // Called after receiving the SwapOutACK when the RVH is in state pending
525 // shutdown. Also called if the unload timer times out. 525 // shutdown. Also called if the unload timer times out.
526 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. 526 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state.
527 base::Closure pending_shutdown_on_swap_out_; 527 base::Closure pending_shutdown_on_swap_out_;
528 528
529 base::WeakPtrFactory<RenderViewHostImpl> weak_factory_;
530
531 // True if the current focused element is editable. 529 // True if the current focused element is editable.
532 bool is_focused_element_editable_; 530 bool is_focused_element_editable_;
533 531
534 // This is updated every time UpdateWebkitPreferences is called. That method 532 // This is updated every time UpdateWebkitPreferences is called. That method
535 // is in turn called when any of the settings change that the WebPreferences 533 // is in turn called when any of the settings change that the WebPreferences
536 // values depend on. 534 // values depend on.
537 scoped_ptr<WebPreferences> web_preferences_; 535 scoped_ptr<WebPreferences> web_preferences_;
538 536
539 bool updating_web_preferences_; 537 bool updating_web_preferences_;
540 538
539 base::WeakPtrFactory<RenderViewHostImpl> weak_factory_;
540
541 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 541 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
542 }; 542 };
543 543
544 #if defined(COMPILER_MSVC) 544 #if defined(COMPILER_MSVC)
545 #pragma warning(pop) 545 #pragma warning(pop)
546 #endif 546 #endif
547 547
548 } // namespace content 548 } // namespace content
549 549
550 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 550 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/compositor_resize_lock_aura.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698