content/browser/net/network_error_request_job.cc - Issue 1421743002: Implement chrome://network-errors for direct access to network error interstitials

Side by Side Diff: content/browser/net/network_error_request_job.cc

Issue 1421743002: Implement chrome://network-errors for direct access to network error interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test, made listing mobile friendly Created 5 years, 1 month 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

« content/browser/net/network_error_request_job.h ('K') | « content/browser/net/network_error_request_job.h ('k') | content/browser/webui/url_data_manager_backend.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 // Copyright 2015 The Chromium Authors. All rights reserved.

	2 // Use of this source code is governed by a BSD-style license that can be

	3 // found in the LICENSE file.

	4

	5 #include "content/browser/net/network_error_request_job.h"

	6

	7 #include "base/strings/string_number_conversions.h"

	8 #include "base/values.h"

	9 #include "net/base/escape.h"

	10 #include "net/base/net_errors.h"

	11 #include "net/log/net_log_util.h"

	12 #include "net/url_request/url_request.h"

	13 #include "url/gurl.h"

	14

	15 namespace content {

	16

	17 static const char kNetworkErrorKey[] = "netError";

	18

	19 NetworkErrorRequestJob::NetworkErrorRequestJob(

	20 net::URLRequest* request,

	21 net::NetworkDelegate* network_delegate)

	22 : net::URLRequestSimpleJob(request, network_delegate),

	23 error_code_(net::Error::OK) {

	24 std::basic_string<char> error_code_string =

	25 request->url().path().substr(1, std::string::npos);

	26

	27 if (!base::StringToInt(error_code_string, &error_code_))

	28 error_code_ = 0;

	29 }

	30

	31 // Creates a HTML page listing all error codes.

	32 void ListAllErrorCodes(std::string* data) {

	33 std::string unescaped_query;

	34 std::string unescaped_title("Network error codes");

	35

	36 data->append("<!DOCTYPE html>\n<html>\n<head>\n");
	Dan Beam 2015/11/19 20:12:52 an additional nit: <!doctype html> an additional nit: <!doctype html> edwardjung 2015/11/20 16:34:51 Will fix in the HTML template Show quoted text On 2015/11/19 20:12:52, Dan Beam wrote: > an additional nit: <!doctype html> Will fix in the HTML template
	37 data->append(

	38 "<meta http-equiv=\"Content-Security-Policy\" "

	39 "content=\"object-src 'none'; script-src 'none'\">");

	40 data->append(

	41 "<meta name=\"viewport\" content=\"width=device-width\">");

	42 data->append("<title>");
	Evan Stade 2015/11/19 16:35:21 this seems like a pretty awkward way to do this, i this seems like a pretty awkward way to do this, it's hard to read and would be very unwieldy if you wanted to add more stuff to it edwardjung 2015/11/19 17:10:14 What do you recommend. Is there a template I shoul Show quoted text On 2015/11/19 16:35:21, Evan Stade wrote: > this seems like a pretty awkward way to do this, it's hard to read and would be > very unwieldy if you wanted to add more stuff to it What do you recommend. Is there a template I should use? It seemed like each chrome:// page is built differently. . Evan Stade 2015/11/19 19:07:14 I have no idea why a few of the chrome:// internal Show quoted text On 2015/11/19 17:10:14, edwardjung wrote: > On 2015/11/19 16:35:21, Evan Stade wrote: > > this seems like a pretty awkward way to do this, it's hard to read and would > be > > very unwieldy if you wanted to add more stuff to it > > What do you recommend. Is there a template I should use? It seemed like each > chrome:// page is built differently. . I have no idea why a few of the chrome:// internals pages use the simple request job and construct html, css and so forth in a C++ file. You should instead follow the example of the ones that don't: https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/we... +dbeam in case he knows of some reason why this codepath which you're copying has any actual reason to exist. Dan Beam 2015/11/19 20:12:52 no, they should not exist. agree with estade@ tha Show quoted text On 2015/11/19 19:07:14, Evan Stade wrote: > On 2015/11/19 17:10:14, edwardjung wrote: > > On 2015/11/19 16:35:21, Evan Stade wrote: > > > this seems like a pretty awkward way to do this, it's hard to read and would > > be > > > very unwieldy if you wanted to add more stuff to it > > > > What do you recommend. Is there a template I should use? It seemed like each > > chrome:// page is built differently. . > > I have no idea why a few of the chrome:// internals pages use the simple request > job and construct html, css and so forth in a C++ file. You should instead > follow the example of the ones that don't: > > https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/we... > > +dbeam in case he knows of some reason why this codepath which you're copying > has any actual reason to exist. no, they should not exist. agree with estade@ that you should be using HTML for structure, external CSS, and JS for dynamic population like the overwhelming majority of pages already do edwardjung 2015/11/20 16:34:51 Okay I'll switch to using the content_web_ui_contr Show quoted text On 2015/11/19 20:12:52, Dan Beam wrote: > On 2015/11/19 19:07:14, Evan Stade wrote: > > On 2015/11/19 17:10:14, edwardjung wrote: > > > On 2015/11/19 16:35:21, Evan Stade wrote: > > > > this seems like a pretty awkward way to do this, it's hard to read and > would > > > be > > > > very unwieldy if you wanted to add more stuff to it > > > > > > What do you recommend. Is there a template I should use? It seemed like each > > > chrome:// page is built differently. . > > > > I have no idea why a few of the chrome:// internals pages use the simple > request > > job and construct html, css and so forth in a C++ file. You should instead > > follow the example of the ones that don't: > > > > > https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/we... > > > > +dbeam in case he knows of some reason why this codepath which you're copying > > has any actual reason to exist. > > no, they should not exist. > > agree with estade@ that you should be using HTML for structure, external CSS, > and JS for dynamic population like the overwhelming majority of pages already do Okay I'll switch to using the content_web_ui_controller_factory for the listing of the network errors. Due to the limitation mentioned by mmenke, I'll still leave the actual displaying of network errors to be handled by this class.
	43 data->append(unescaped_title);

	44 data->append("</title>\n");

	45 data->append("<link rel=\"stylesheet\"");

	46 data->append("href=\"chrome://resources/css/chrome_shared.css\">\n");

	47 data->append("</head><body style=\"margin:1em; line-height:1.5em\">");
	Evan Stade 2015/11/19 16:35:21 and it doesn't allow for separation of content and and it doesn't allow for separation of content and presentation edwardjung 2015/11/19 17:10:14 Agreed, but didn't know whether creating a new sty Show quoted text On 2015/11/19 16:35:21, Evan Stade wrote: > and it doesn't allow for separation of content and presentation Agreed, but didn't know whether creating a new stylesheet just for this was okay. It would be good to have a base stylesheet for all of these pages so they look consistent
	48 data->append("<h1>");

	49 data->append(unescaped_title);

	50 data->append("</h1>");

	51

	52 scoped_ptr<base::DictionaryValue> error_codes = net::GetNetConstants();

	53 const base::DictionaryValue* net_error_codes_dict = nullptr;

	54

	55 for (base::DictionaryValue::Iterator itr(*error_codes); !itr.IsAtEnd();

	56 itr.Advance()) {

	57 if (itr.key() == kNetworkErrorKey) {

	58 itr.value().GetAsDictionary(&net_error_codes_dict);

	59 break;

	60 }

	61 }

	62

	63 data->append("<ul>");

	64 for (base::DictionaryValue::Iterator itr(*net_error_codes_dict);

	65 !itr.IsAtEnd(); itr.Advance()) {

	66 int error_code;

	67 itr.value().GetAsInteger(&error_code);

	68 data->append("<li><a href=\"");

	69 data->append(base::IntToString(error_code));

	70 data->append("\">");

	71 data->append(itr.key());

	72 data->append(" (");

	73 data->append(base::IntToString(error_code));

	74 data->append(")</a></li>\n");

	75 }

	76 data->append("</ul>");

	77 }

	78

	79 int NetworkErrorRequestJob::GetData(

	80 std::string* mime_type,

	81 std::string* charset,

	82 std::string* data,

	83 const net::CompletionCallback& callback) const {

	84 mime_type->assign("text/html");

	85 charset->assign("UTF8");

	86

	87 if (error_code_ == 0 \|\| error_code_ == net::Error::ERR_IO_PENDING) {

	88 ListAllErrorCodes(data);

	89 return net::OK;

	90 }

	91 return error_code_;

	92 }

	93

	94 } // namespace content

OLD	NEW