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

Side by Side Diff: chrome/browser/ui/webui/system_info_ui.cc

Issue 830743003: Directly inline shared WebUI CSS declarations into the security and supervised user interstitials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: review Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/system_info_ui.h" 5 #include "chrome/browser/ui/webui/system_info_ui.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/ref_counted_memory.h" 9 #include "base/memory/ref_counted_memory.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 strings.SetString("expandAllBtn", 132 strings.SetString("expandAllBtn",
133 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND_ALL)); 133 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND_ALL));
134 strings.SetString("collapseAllBtn", 134 strings.SetString("collapseAllBtn",
135 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE_ALL)); 135 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE_ALL));
136 strings.SetString("expandBtn", 136 strings.SetString("expandBtn",
137 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND)); 137 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND));
138 strings.SetString("collapseBtn", 138 strings.SetString("collapseBtn",
139 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE)); 139 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE));
140 strings.SetString("parseError", 140 strings.SetString("parseError",
141 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_PARSE_ERROR)); 141 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_PARSE_ERROR));
142 webui::SetFontAndTextDirection(&strings); 142 webui::SetTextDirection(&strings);
143 if (response_.get()) { 143 if (response_.get()) {
144 base::ListValue* details = new base::ListValue(); 144 base::ListValue* details = new base::ListValue();
145 strings.Set("details", details); 145 strings.Set("details", details);
146 for (SystemLogsResponse::const_iterator it = response_->begin(); 146 for (SystemLogsResponse::const_iterator it = response_->begin();
147 it != response_->end(); 147 it != response_->end();
148 ++it) { 148 ++it) {
149 base::DictionaryValue* val = new base::DictionaryValue; 149 base::DictionaryValue* val = new base::DictionaryValue;
150 val->SetString("statName", it->first); 150 val->SetString("statName", it->first);
151 val->SetString("statValue", it->second); 151 val->SetString("statValue", it->second);
152 details->Append(val); 152 details->Append(val);
(...skipping 29 matching lines...) Expand all
182 182
183 SystemInfoUI::SystemInfoUI(content::WebUI* web_ui) : WebUIController(web_ui) { 183 SystemInfoUI::SystemInfoUI(content::WebUI* web_ui) : WebUIController(web_ui) {
184 SystemInfoHandler* handler = new SystemInfoHandler(); 184 SystemInfoHandler* handler = new SystemInfoHandler();
185 web_ui->AddMessageHandler(handler); 185 web_ui->AddMessageHandler(handler);
186 SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource(); 186 SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();
187 187
188 // Set up the chrome://system/ source. 188 // Set up the chrome://system/ source.
189 Profile* profile = Profile::FromWebUI(web_ui); 189 Profile* profile = Profile::FromWebUI(web_ui);
190 content::URLDataSource::Add(profile, html_source); 190 content::URLDataSource::Add(profile, html_source);
191 } 191 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698