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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/chromeos/arc_support/main.html

Issue 2225933002: Suppress ToS and reflect admin policy in ARC++ welcome screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add OS_CHROMEOS checks Created 4 years, 4 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/resources/chromeos/arc_support/background.js ('k') | chrome/browser/resources/chromeos/arc_support/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/arc_support/main.html
diff --git a/chrome/browser/resources/chromeos/arc_support/main.html b/chrome/browser/resources/chromeos/arc_support/main.html
index a176eebf8723e987dc3a12d8d23562c5b0c58343..092caec1ca15f706d62586a7f048f388730a197b 100644
--- a/chrome/browser/resources/chromeos/arc_support/main.html
+++ b/chrome/browser/resources/chromeos/arc_support/main.html
@@ -2,6 +2,8 @@
<html>
<head>
<link rel="stylesheet" href="chrome://resources/css/roboto.css">
+ <link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
+ <link rel="stylesheet" href="chrome://resources/css/controlled_indicator.css">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
@@ -58,7 +60,7 @@
<div class="content section-flex">
<p class="text-title" i18n-content="greetingHeader"></p>
<p class="text-desc" i18n-content="greetingDescription"></p>
- <p class="text-terms-title" i18n-content="termsOfService"></p>
+ <p class="text-terms-title" id="terms-title" i18n-content="termsOfService"></p>
<div class="section-terms" id ="terms-container">
<webview id="terms-view" partition="persist:arc_support"></webview>
</div>
@@ -74,6 +76,13 @@
id="enable-backup-restore">
</div>
<p class="checkbox-text" id="text-backup-restore"></p>
+ <span class="bubble-button controlled-setting-indicator"
+ style="display: none"
+ id="backup-management-indicator"
+ pref="arc.backup_restore.enabled"
+ controlled-by="policy">
+ <div></div>
+ </span>
</label>
<label class="layout horizontal section-checkbox-container">
<div class="checkbox-container">
@@ -81,6 +90,13 @@
id="enable-location-service">
</div>
<p class="checkbox-text" id="text-location-service"></p>
+ <span class="bubble-button controlled-setting-indicator"
+ style="display: none"
+ id="location-management-indicator"
+ pref="arc.location_service.enabled"
+ controlled-by="policy">
+ <div></div>
+ </span>
</label>
<div class="layout horizontal end-justified section-buttons">
<paper-button class="white" id="button-cancel"
« no previous file with comments | « chrome/browser/resources/chromeos/arc_support/background.js ('k') | chrome/browser/resources/chromeos/arc_support/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698