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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 880313002: webui: add [lang] attribute to <html> element on all webui pages so (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cros Created 5 years, 10 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
« no previous file with comments | « chrome/browser/ui/webui/signin/user_manager_ui.cc ('k') | chrome/common/localized_error.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/strings/string_piece.h" 13 #include "base/strings/string_piece.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/feedback/system_logs/about_system_logs_fetcher.h" 21 #include "chrome/browser/feedback/system_logs/about_system_logs_fetcher.h"
21 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
24 #include "chrome/grit/chromium_strings.h" 25 #include "chrome/grit/chromium_strings.h"
25 #include "chrome/grit/generated_resources.h" 26 #include "chrome/grit/generated_resources.h"
26 #include "chrome/grit/locale_settings.h" 27 #include "chrome/grit/locale_settings.h"
27 #include "content/public/browser/url_data_source.h" 28 #include "content/public/browser/url_data_source.h"
28 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
29 #include "content/public/browser/web_ui.h" 30 #include "content/public/browser/web_ui.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 strings.SetString("expandAllBtn", 133 strings.SetString("expandAllBtn",
133 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND_ALL)); 134 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND_ALL));
134 strings.SetString("collapseAllBtn", 135 strings.SetString("collapseAllBtn",
135 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE_ALL)); 136 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE_ALL));
136 strings.SetString("expandBtn", 137 strings.SetString("expandBtn",
137 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND)); 138 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND));
138 strings.SetString("collapseBtn", 139 strings.SetString("collapseBtn",
139 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE)); 140 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE));
140 strings.SetString("parseError", 141 strings.SetString("parseError",
141 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_PARSE_ERROR)); 142 l10n_util::GetStringUTF16(IDS_ABOUT_SYS_PARSE_ERROR));
142 webui::SetFontAndTextDirection(&strings); 143
144 const std::string& app_locale = g_browser_process->GetApplicationLocale();
145 webui::SetLoadTimeDataDefaults(app_locale, &strings);
146
143 if (response_.get()) { 147 if (response_.get()) {
144 base::ListValue* details = new base::ListValue(); 148 base::ListValue* details = new base::ListValue();
145 strings.Set("details", details); 149 strings.Set("details", details);
146 for (SystemLogsResponse::const_iterator it = response_->begin(); 150 for (SystemLogsResponse::const_iterator it = response_->begin();
147 it != response_->end(); 151 it != response_->end();
148 ++it) { 152 ++it) {
149 base::DictionaryValue* val = new base::DictionaryValue; 153 base::DictionaryValue* val = new base::DictionaryValue;
150 val->SetString("statName", it->first); 154 val->SetString("statName", it->first);
151 val->SetString("statValue", it->second); 155 val->SetString("statValue", it->second);
152 details->Append(val); 156 details->Append(val);
(...skipping 29 matching lines...) Expand all
182 186
183 SystemInfoUI::SystemInfoUI(content::WebUI* web_ui) : WebUIController(web_ui) { 187 SystemInfoUI::SystemInfoUI(content::WebUI* web_ui) : WebUIController(web_ui) {
184 SystemInfoHandler* handler = new SystemInfoHandler(); 188 SystemInfoHandler* handler = new SystemInfoHandler();
185 web_ui->AddMessageHandler(handler); 189 web_ui->AddMessageHandler(handler);
186 SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource(); 190 SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();
187 191
188 // Set up the chrome://system/ source. 192 // Set up the chrome://system/ source.
189 Profile* profile = Profile::FromWebUI(web_ui); 193 Profile* profile = Profile::FromWebUI(web_ui);
190 content::URLDataSource::Add(profile, html_source); 194 content::URLDataSource::Add(profile, html_source);
191 } 195 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/signin/user_manager_ui.cc ('k') | chrome/common/localized_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698