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

Side by Side Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 11959029: Make the v8 Isolate used in the proxy resolver explicit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed component build Created 7 years, 11 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 | 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 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 string16 url_str; 1200 string16 url_str;
1201 CHECK(list->GetString(0, &url_str)); 1201 CHECK(list->GetString(0, &url_str));
1202 1202
1203 // Try to fix-up the user provided URL into something valid. 1203 // Try to fix-up the user provided URL into something valid.
1204 // For example, turn "www.google.com" into "http://www.google.com". 1204 // For example, turn "www.google.com" into "http://www.google.com".
1205 GURL url(URLFixerUpper::FixupURL(UTF16ToUTF8(url_str), std::string())); 1205 GURL url(URLFixerUpper::FixupURL(UTF16ToUTF8(url_str), std::string()));
1206 1206
1207 connection_tester_.reset(new ConnectionTester( 1207 connection_tester_.reset(new ConnectionTester(
1208 this, 1208 this,
1209 io_thread_->globals()->proxy_script_fetcher_context.get(), 1209 io_thread_->globals()->proxy_script_fetcher_context.get(),
1210 net_log())); 1210 net_log(),
1211 io_thread_->globals()->v8_default_isolate));
1211 connection_tester_->RunAllTests(url); 1212 connection_tester_->RunAllTests(url);
1212 } 1213 }
1213 1214
1214 void NetInternalsMessageHandler::IOThreadImpl::OnHSTSQuery( 1215 void NetInternalsMessageHandler::IOThreadImpl::OnHSTSQuery(
1215 const ListValue* list) { 1216 const ListValue* list) {
1216 // |list| should be: [<domain to query>]. 1217 // |list| should be: [<domain to query>].
1217 std::string domain; 1218 std::string domain;
1218 CHECK(list->GetString(0, &domain)); 1219 CHECK(list->GetString(0, &domain));
1219 DictionaryValue* result = new DictionaryValue(); 1220 DictionaryValue* result = new DictionaryValue();
1220 1221
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
1936 1937
1937 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1938 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1938 : WebUIController(web_ui) { 1939 : WebUIController(web_ui) {
1939 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1940 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1940 1941
1941 // Set up the chrome://net-internals/ source. 1942 // Set up the chrome://net-internals/ source.
1942 Profile* profile = Profile::FromWebUI(web_ui); 1943 Profile* profile = Profile::FromWebUI(web_ui);
1943 ChromeURLDataManager::AddDataSourceImpl(profile, 1944 ChromeURLDataManager::AddDataSourceImpl(profile,
1944 CreateNetInternalsHTMLSource()); 1945 CreateNetInternalsHTMLSource());
1945 } 1946 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698