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

Unified Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 125443002: In-app messaging to communicate the imminent 32-bit deprecation to 32-bit-only users (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/help/help_handler.cc
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 4f6e39c5596480902582a65c0533878131442fd2..d8a833aec758a2bd1e282b3e47afb8174e84c3ef 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -38,6 +38,10 @@
#include "v8/include/v8.h"
#include "webkit/common/user_agent/user_agent_util.h"
+#if defined(OS_MACOSX)
+#include "chrome/browser/mac/system_bitness.h"
+#endif
+
#if defined(OS_CHROMEOS)
#include "base/files/file_util_proxy.h"
#include "base/i18n/time_formatting.h"
@@ -215,6 +219,13 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) {
l10n_util::GetStringUTF16(resources[i].ids));
}
+#if defined(OS_MACOSX)
+ source->AddString("updateObsoleteSystem",
+ chrome::LocalizedObsoleteSystemString());
+ source->AddString("updateObsoleteSystemURL",
+ chrome::kMac32BitDeprecationURL);
+#endif
+
source->AddString(
"browserVersion",
l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
@@ -344,6 +355,17 @@ void HelpHandler::OnPageLoaded(const base::ListValue* args) {
#endif
);
+#if defined(OS_MACOSX)
+ web_ui()->CallJavascriptFunction(
+ "help.HelpPage.setObsoleteSystem",
+ base::FundamentalValue(chrome::Is32BitObsoleteNowOrSoon() &&
+ chrome::Has32BitOnlyCPU()));
+ web_ui()->CallJavascriptFunction(
+ "help.HelpPage.setObsoleteSystemEndOfTheLine",
+ base::FundamentalValue(chrome::Is32BitObsoleteNowOrSoon() &&
+ chrome::Is32BitEndOfTheLine()));
+#endif
+
#if defined(OS_CHROMEOS)
web_ui()->CallJavascriptFunction(
"help.HelpPage.updateIsEnterpriseManaged",

Powered by Google App Engine
This is Rietveld 408576698