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

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Issue 9836039: Add reporting notification to the enterprise banner on the CrOS login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 53dba7fabe2235545f6f4f0a969ab7e100fa8221..56ace891d662eaf42e5221e4d5f149fa40181d54 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/values.h"
#include "base/utf_string_conversions.h"
+#include "base/values.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "chrome/common/chrome_version_info.h"
@@ -45,6 +45,9 @@ void CoreOobeHandler::GetLocalizedStrings(
"productName", l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
localized_strings->SetString(
"learnMore", l10n_util::GetStringUTF16(IDS_LEARN_MORE));
+ localized_strings->SetString(
+ "reportingHint",
+ l10n_util::GetStringUTF16(IDS_LOGIN_MANAGED_REPORTING_HINT));
}
void CoreOobeHandler::Initialize() {
@@ -103,10 +106,13 @@ void CoreOobeHandler::OnBootTimesLabelTextUpdated(
}
void CoreOobeHandler::OnEnterpriseInfoUpdated(
- const std::string& message_text) {
+ const std::string& message_text,
+ bool reporting_hint) {
base::StringValue message_text_vaue(UTF8ToUTF16(message_text));
+ base::FundamentalValue show_help_link(reporting_hint);
web_ui()->CallJavascriptFunction("cr.ui.Oobe.setEnterpriseInfo",
- message_text_vaue);
+ message_text_vaue,
+ show_help_link);
}
void CoreOobeHandler::UpdateLabel(const std::string& id,
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698