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

Unified Diff: chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc

Issue 2363553003: VrShell: implement insecure content warning display (Closed)
Patch Set: Rebase fixups: QuatToAxisAngle API, unused cursor_distance_ Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
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..c35752662491efbbda6c2423e62da903557e5d5e 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,16 @@ 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 currently use gzip since it's
+ // incompatible with i18n. TODO(klausw): re-enable gzip once an i18n
+ // compatible variant of WebUIDataSource's DisableI18nAndUseGzipForAllPaths
+ // gets added, and add compress=gzip to browser_resources.grd as appropriate.
+ source->AddLocalizedString(
+ "insecureWebVrContentPermanent",
+ IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_PERMANENT);
+ source->AddLocalizedString(
+ "insecureWebVrContentTransient",
+ IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_TRANSIENT);
return source;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698