| Index: chrome/browser/resources/chromeos/arc_support/background.js
|
| diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrome/browser/resources/chromeos/arc_support/background.js
|
| index e6acea59ccc6aab4138827b4dd8c728a5344705b..65a459c0cf210e94a30358978081050282a6f221 100644
|
| --- a/chrome/browser/resources/chromeos/arc_support/background.js
|
| +++ b/chrome/browser/resources/chromeos/arc_support/background.js
|
| @@ -111,6 +111,7 @@ function initialize(data, deviceId) {
|
| appWindow.contentWindow.i18nTemplate.process(doc, loadTimeData);
|
| var countryCode = data.countryCode.toLowerCase();
|
| setBackupRestoreMode(data.textBackupRestore, data.backupRestoreEnabled);
|
| + setLocationServiceMode(data.textLocationService, data.locationServiceEnabled);
|
|
|
| var scriptSetCountryCode = 'document.countryCode = \'' + countryCode + '\';';
|
| termsView.addContentScripts([
|
| @@ -148,7 +149,8 @@ var onLearnMore = function(event) {
|
| function setMetricsMode(text, canEnable, on) {
|
| var doc = appWindow.contentWindow.document;
|
| var enableMetrics = doc.getElementById('enable-metrics');
|
| - enableMetrics.hidden = !canEnable;
|
| + var enableMetricsContainer = doc.getElementById('enable-metrics-container');
|
| + enableMetricsContainer.hidden = !canEnable;
|
| enableMetrics.checked = on;
|
|
|
| var onSettings = function(event) {
|
| @@ -166,7 +168,7 @@ function setMetricsMode(text, canEnable, on) {
|
| }
|
|
|
| /**
|
| - * Sets current metrics mode.
|
| + * Sets current backup and restore mode.
|
| * @param {string} text String used to display next to checkbox.
|
| * @param {boolean} defaultCheckValue Defines the default value for backup and
|
| * restore checkbox.
|
| @@ -181,6 +183,21 @@ function setBackupRestoreMode(text, defaultCheckValue) {
|
| }
|
|
|
| /**
|
| + * Sets current usage of location service opt in mode.
|
| + * @param {string} text String used to display next to checkbox.
|
| + * @param {boolean} defaultCheckValue Defines the default value for location
|
| + * service opt in.
|
| + */
|
| +function setLocationServiceMode(text, defaultCheckValue) {
|
| + var doc = appWindow.contentWindow.document;
|
| + doc.getElementById('enable-location-service').checked = defaultCheckValue;
|
| +
|
| + doc.getElementById('text-location-service').innerHTML = text;
|
| + doc.getElementById('learn-more-link-location-service').
|
| + addEventListener('click', onLearnMore);
|
| +}
|
| +
|
| +/**
|
| * Updates terms view height manually because webview is not automatically
|
| * resized in case parent div element gets resized.
|
| */
|
| @@ -465,7 +482,9 @@ chrome.app.runtime.onLaunched.addListener(function() {
|
| termsAccepted = true;
|
|
|
| var enableMetrics = doc.getElementById('enable-metrics');
|
| - if (!enableMetrics.hidden) {
|
| + var enableMetricsContainer =
|
| + doc.getElementById('enable-metrics-container');
|
| + if (!enableMetricsContainer.hidden) {
|
| sendNativeMessage('enableMetrics', {
|
| 'enabled': enableMetrics.checked
|
| });
|
| @@ -476,6 +495,11 @@ chrome.app.runtime.onLaunched.addListener(function() {
|
| 'enabled': enableBackupRestore.checked
|
| });
|
|
|
| + var enableLocationService = doc.getElementById('enable-location-service');
|
| + sendNativeMessage('setLocationService', {
|
| + 'enabled': enableLocationService.checked
|
| + });
|
| +
|
| sendNativeMessage('startLso');
|
| };
|
|
|
|
|