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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 2346863003: PrerenderManager: No longer expose weak pointers. (Closed)
Patch Set: Fix net-internals 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 0319b19b34bd43c9602c725dbbdda9c6151d3ab3..662d2add5223066b3b561bbcf2497473d80e422b 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -240,8 +240,6 @@ class NetInternalsMessageHandler
// This is the "real" message handler, which lives on the IO thread.
scoped_refptr<IOThreadImpl> proxy_;
- base::WeakPtr<prerender::PrerenderManager> prerender_manager_;
-
DISALLOW_COPY_AND_ASSIGN(NetInternalsMessageHandler);
};
@@ -410,14 +408,6 @@ void NetInternalsMessageHandler::RegisterMessages() {
proxy_->AddRequestContextGetter(profile->GetRequestContextForExtensions());
#endif
- prerender::PrerenderManager* prerender_manager =
- prerender::PrerenderManagerFactory::GetForProfile(profile);
- if (prerender_manager) {
- prerender_manager_ = prerender_manager->AsWeakPtr();
- } else {
- prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>();
- }
-
web_ui()->RegisterMessageCallback(
"notifyReady",
base::Bind(&NetInternalsMessageHandler::OnRendererReady,
@@ -542,8 +532,12 @@ void NetInternalsMessageHandler::OnGetPrerenderInfo(
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::unique_ptr<base::DictionaryValue> value;
- if (prerender_manager_) {
- value = prerender_manager_->GetAsValue();
+
+ prerender::PrerenderManager* prerender_manager =
+ prerender::PrerenderManagerFactory::GetForProfile(
+ Profile::FromWebUI(web_ui()));
+ if (prerender_manager) {
+ value = prerender_manager->GetAsValue();
} else {
value.reset(new base::DictionaryValue());
value->SetBoolean("enabled", false);
« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698