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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
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 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" 5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 622
623 proxy_ = new IOThreadImpl(this->AsWeakPtr(), g_browser_process->io_thread(), 623 proxy_ = new IOThreadImpl(this->AsWeakPtr(), g_browser_process->io_thread(),
624 profile->GetRequestContext()); 624 profile->GetRequestContext());
625 proxy_->AddRequestContextGetter(profile->GetMediaRequestContext()); 625 proxy_->AddRequestContextGetter(profile->GetMediaRequestContext());
626 proxy_->AddRequestContextGetter(profile->GetRequestContextForExtensions()); 626 proxy_->AddRequestContextGetter(profile->GetRequestContextForExtensions());
627 #if defined(OS_CHROMEOS) 627 #if defined(OS_CHROMEOS)
628 syslogs_getter_.reset(new SystemLogsGetter(this, 628 syslogs_getter_.reset(new SystemLogsGetter(this,
629 chromeos::system::SyslogsProvider::GetInstance())); 629 chromeos::system::SyslogsProvider::GetInstance()));
630 #endif 630 #endif
631 631
632 #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.
632 prerender::PrerenderManager* prerender_manager = 633 prerender::PrerenderManager* prerender_manager =
633 prerender::PrerenderManagerFactory::GetForProfile(profile); 634 prerender::PrerenderManagerFactory::GetForProfile(profile);
634 if (prerender_manager) { 635 if (prerender_manager) {
635 prerender_manager_ = prerender_manager->AsWeakPtr(); 636 prerender_manager_ = prerender_manager->AsWeakPtr();
636 } else { 637 } else {
637 prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>(); 638 prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>();
638 } 639 }
640 #endif
639 641
640 web_ui()->RegisterMessageCallback( 642 web_ui()->RegisterMessageCallback(
641 "notifyReady", 643 "notifyReady",
642 base::Bind(&NetInternalsMessageHandler::OnRendererReady, 644 base::Bind(&NetInternalsMessageHandler::OnRendererReady,
643 base::Unretained(this))); 645 base::Unretained(this)));
644 web_ui()->RegisterMessageCallback( 646 web_ui()->RegisterMessageCallback(
645 "getProxySettings", 647 "getProxySettings",
646 base::Bind(&IOThreadImpl::CallbackHelper, 648 base::Bind(&IOThreadImpl::CallbackHelper,
647 &IOThreadImpl::OnGetProxySettings, proxy_)); 649 &IOThreadImpl::OnGetProxySettings, proxy_));
648 web_ui()->RegisterMessageCallback( 650 web_ui()->RegisterMessageCallback(
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 Profile::FromWebUI(web_ui())); 799 Profile::FromWebUI(web_ui()));
798 remover->Remove(BrowsingDataRemover::REMOVE_CACHE, 800 remover->Remove(BrowsingDataRemover::REMOVE_CACHE,
799 BrowsingDataHelper::UNPROTECTED_WEB); 801 BrowsingDataHelper::UNPROTECTED_WEB);
800 // BrowsingDataRemover deletes itself. 802 // BrowsingDataRemover deletes itself.
801 } 803 }
802 804
803 void NetInternalsMessageHandler::OnGetPrerenderInfo(const ListValue* list) { 805 void NetInternalsMessageHandler::OnGetPrerenderInfo(const ListValue* list) {
804 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 806 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
805 807
806 DictionaryValue* value = NULL; 808 DictionaryValue* value = NULL;
809 #if !defined(OS_IOS)
807 prerender::PrerenderManager* prerender_manager = prerender_manager_.get(); 810 prerender::PrerenderManager* prerender_manager = prerender_manager_.get();
808 if (!prerender_manager) { 811 if (!prerender_manager) {
809 value = new DictionaryValue(); 812 value = new DictionaryValue();
810 value->SetBoolean("enabled", false); 813 value->SetBoolean("enabled", false);
811 value->SetBoolean("omnibox_enabled", false); 814 value->SetBoolean("omnibox_enabled", false);
812 } else { 815 } else {
813 value = prerender_manager->GetAsValue(); 816 value = prerender_manager->GetAsValue();
814 } 817 }
818 #endif
815 SendJavascriptCommand("receivedPrerenderInfo", value); 819 SendJavascriptCommand("receivedPrerenderInfo", value);
816 } 820 }
817 821
818 void NetInternalsMessageHandler::OnGetHistoricNetworkStats( 822 void NetInternalsMessageHandler::OnGetHistoricNetworkStats(
819 const ListValue* list) { 823 const ListValue* list) {
820 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 824 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
821 Value* historic_network_info = 825 Value* historic_network_info =
822 ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue(); 826 ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue();
823 SendJavascriptCommand("receivedHistoricNetworkStats", historic_network_info); 827 SendJavascriptCommand("receivedHistoricNetworkStats", historic_network_info);
824 } 828 }
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1910 } 1914 }
1911 1915
1912 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1916 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1913 : WebUIController(web_ui) { 1917 : WebUIController(web_ui) {
1914 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1918 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1915 1919
1916 // Set up the chrome://net-internals/ source. 1920 // Set up the chrome://net-internals/ source.
1917 Profile* profile = Profile::FromWebUI(web_ui); 1921 Profile* profile = Profile::FromWebUI(web_ui);
1918 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource()); 1922 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource());
1919 } 1923 }
OLDNEW
« 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