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

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

Issue 11450023: Partial changes to enable net-internals in iOS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years 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
Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
===================================================================
--- chrome/browser/ui/webui/net_internals/net_internals_ui.cc (revision 172023)
+++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc (working copy)
@@ -629,6 +629,7 @@
chromeos::system::SyslogsProvider::GetInstance()));
#endif
+#if !defined(OS_IOS)
stuartmorgan 2012/12/10 12:56:03 These changes should be made downstream-only for n
ramant (doing other things) 2012/12/11 05:34:16 Done.
prerender::PrerenderManager* prerender_manager =
prerender::PrerenderManagerFactory::GetForProfile(profile);
if (prerender_manager) {
@@ -636,6 +637,7 @@
} else {
prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>();
}
+#endif
web_ui()->RegisterMessageCallback(
"notifyReady",
@@ -804,6 +806,7 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DictionaryValue* value = NULL;
+#if !defined(OS_IOS)
prerender::PrerenderManager* prerender_manager = prerender_manager_.get();
if (!prerender_manager) {
value = new DictionaryValue();
@@ -812,6 +815,7 @@
} else {
value = prerender_manager->GetAsValue();
}
+#endif
SendJavascriptCommand("receivedPrerenderInfo", value);
}
« chrome/browser/net/load_timing_observer.h ('K') | « chrome/browser/net/load_timing_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698