Chromium Code Reviews| Index: chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc |
| diff --git a/chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc b/chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc |
| index 1ce55c9c4ef29e9e10bb8e12b10789c466ae393a..4978023af22d1970ddbef489612d469aa68204be 100644 |
| --- a/chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc |
| +++ b/chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc |
| @@ -11,6 +11,7 @@ |
| #if !defined(ENABLE_VR_SHELL_UI_DEV) |
| #include "chrome/grit/browser_resources.h" |
| +#include "chrome/grit/generated_resources.h" |
| #include "content/public/browser/web_ui_data_source.h" |
| #else |
| #include <map> |
| @@ -179,7 +180,14 @@ content::WebUIDataSource* CreateVrShellUIHTMLSource() { |
| source->AddResourcePath("vr_shell_ui.js", IDR_VR_SHELL_UI_JS); |
| source->AddResourcePath("vr_shell_ui.css", IDR_VR_SHELL_UI_CSS); |
| source->SetDefaultResource(IDR_VR_SHELL_UI_HTML); |
| - source->DisableI18nAndUseGzipForAllPaths(); |
| + // We're localizing strings, so we can't use gzip since it's incompatible with |
| + // i18n. See WebUIDataSource's DisableI18nAndUseGzipForAllPaths() comments. |
|
bshe
2016/09/29 13:50:56
The above comment seems more relevant to the chang
|
| + source->AddLocalizedString( |
| + "insecureWebVrContentPermanent", |
| + IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_PERMANENT); |
| + source->AddLocalizedString( |
| + "insecureWebVrContentTransient", |
| + IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_TRANSIENT); |
| return source; |
| } |
| #endif |