Commit b28603d6 authored by rkc@chromium.org's avatar rkc@chromium.org

Change email to be OPT-IN on Chrome and OPT-OUT on cros.

This CL changes the email box to be checked for chrome os and unchecked for Chrome.

R=jhawkins@chromium.org
BUG=140946


Review URL: https://chromiumcodereview.appspot.com/10834194

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150226 0039d316-1c4b-4281-b951-d872f2087c98
parent fc0b660c
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<!-- User e-mail --> <!-- User e-mail -->
<div id="user-email" class="input-text-container checkbox"> <div id="user-email" class="input-text-container checkbox">
<label> <label>
<input id="user-email-checkbox" type="checkbox" checked> <input id="user-email-checkbox" type="checkbox">
<span id="user-email-label" i18n-content="user-email"></span> <span id="user-email-label" i18n-content="user-email"></span>
</label> </label>
<input id="user-email-text"> <input id="user-email-text">
......
...@@ -284,6 +284,7 @@ function setupDialogDefaults(defaults) { ...@@ -284,6 +284,7 @@ function setupDialogDefaults(defaults) {
$('page-url-checkbox').checked = false; $('page-url-checkbox').checked = false;
// User e-mail. // User e-mail.
$('user-email-text').value = defaults.userEmail; $('user-email-text').value = defaults.userEmail;
$('user-email-checkbox').checked = defaults.emailCheckboxDefault;
// Are screenshots disabled? // Are screenshots disabled?
if (!defaults.disableScreenshots) if (!defaults.disableScreenshots)
......
...@@ -476,6 +476,16 @@ void FeedbackHandler::HandleGetDialogDefaults(const ListValue*) { ...@@ -476,6 +476,16 @@ void FeedbackHandler::HandleGetDialogDefaults(const ListValue*) {
std::string user_email = GetUserEmail(); std::string user_email = GetUserEmail();
dialog_defaults.SetString("userEmail", user_email); dialog_defaults.SetString("userEmail", user_email);
// Set email checkbox to checked by default for cros, unchecked for Chrome.
dialog_defaults.SetBoolean(
"emailCheckboxDefault",
#if defined(OS_CHROMEOS)
true);
#else
false);
#endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// Trigger the request for system information here. // Trigger the request for system information here.
chromeos::system::SyslogsProvider* provider = chromeos::system::SyslogsProvider* provider =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment