VrShell: implement insecure content warning display

chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 
 #if !defined(ENABLE_VR_SHELL_UI_DEV)
+#include "chrome/browser/browser_process.h"
 #include "chrome/grit/browser_resources.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/webui/web_ui_util.h"
 #else
 #include <map>
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/url_data_source.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #endif
@@ skipping 147 matching lines @@
   delete source;
   pending_.erase(it);
 }
 #else
 content::WebUIDataSource* CreateVrShellUIHTMLSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIVrShellUIHost);
   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.
+
+  base::DictionaryValue localized_strings;
+
+  localized_strings.SetString(
+      "insecureWebVrContentPermanent",
+      l10n_util::GetStringUTF16(
+          IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_PERMANENT));
+  localized_strings.SetString(
+      "insecureWebVrContentTransient",
+      l10n_util::GetStringUTF16(
+          IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_TRANSIENT));
+
+  const std::string& app_locale = g_browser_process->GetApplicationLocale();
+  webui::SetLoadTimeDataDefaults(app_locale, &localized_strings);

[Dan Beam, 2016/10/03 20:30:59]

why are you adding this?  SetLoadTimeDataDefaults() should be running through
magic already

[klausw, 2016/10/03 21:28:19]

Thank you, it does indeed work without it. FWIW, that's rather subtle magic, I
didn't see any indication in
https://cs.chromium.org/chromium/src/content/public/browser/web_ui_data_source.h
that it does this, I only found it after reading the _impl file.

+
+  source->AddLocalizedStrings(localized_strings);
   return source;
 }
 #endif
 
 }  // namespace
 
 VrShellUIUI::VrShellUIUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
 #if !defined(ENABLE_VR_SHELL_UI_DEV)
   content::WebUIDataSource::Add(profile, CreateVrShellUIHTMLSource());
 #else
   content::URLDataSource::Add(
       profile, new RemoteDataSource(profile->GetRequestContext()));
 #endif
   web_ui->AddMessageHandler(new VrShellUIMessageHandler);
 }
 
 VrShellUIUI::~VrShellUIUI() {}