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

Unified Diff: chrome/browser/resources/settings/printing_page/printing_page.html

Issue 2110653003: CUPS: MD Settings printers subpage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Format the Google cloud printing icon. Created 4 years, 5 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/resources/settings/printing_page/printing_page.html
diff --git a/chrome/browser/resources/settings/printing_page/printing_page.html b/chrome/browser/resources/settings/printing_page/printing_page.html
index e9e547e81b2fdc6d374abe4cea8e19f933064381..3be4bcef231dcf27c0163840ab8f62a3e3d592e9 100644
--- a/chrome/browser/resources/settings/printing_page/printing_page.html
+++ b/chrome/browser/resources/settings/printing_page/printing_page.html
@@ -1,28 +1,48 @@
<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
-<link rel="import" href="/controls/settings_checkbox.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
+<link rel="import" href="/icons.html">
+<link rel="import" href="/printing_page/cloud_printers.html">
+<if expr="chromeos">
+<link rel="import" href="/printing_page/cups_printers.html">
+</if>
+<link rel="import" href="/settings_page/settings_animated_pages.html">
+<link rel="import" href="/settings_page/settings_subpage.html">
<link rel="import" href="/settings_shared_css.html">
<dom-module id="settings-printing-page">
<template>
<style include="settings-shared"></style>
- <div class="settings-box first">
- <span>
- $i18n{printingCloudPrintLearnMoreLabel}
- <a href="$i18n{printingCloudPrintLearnMoreUrl}" target="_blank">
- $i18n{learnMore}
- </a>
- </span>
- </div>
- <div class="settings-box">
- <settings-checkbox pref="{{prefs.local_discovery.notifications_enabled}}"
- label="$i18n{printingNotificationsLabel}"></settings-checkbox>
- </div>
- <div class="settings-box">
- <paper-button class="primary-button" on-tap="onManageTap_">
- $i18n{printingManageCloudPrintDevices}
- </paper-button>
- </div>
+ <settings-animated-pages id="pages" current-route="{{currentRoute}}"
+ section="printing">
+ <neon-animatable id="main">
+<if expr="chromeos">
+ <div id="cupsPrinters" class="settings-box first"
+ on-tap="onTapCupsPrinters_" actionable>
+ <iron-icon icon="cr:print"></iron-icon>
+ <div class="middle">$i18n{cupsPrintersTitle}</div>
+ </div>
+</if>
+ <div id="cloudPrinters" class="settings-box"
+ on-tap="onTapCloudPrinters_" actionable>
+ <iron-icon icon="settings:cloud-printing"></iron-icon>
+ <div class="middle">$i18n{cloudPrintersTitle}</div>
+ </div>
+ </neon-animatable>
+<if expr="chromeos">
+ <template is="dom-if" name="cups-printers">
+ <settings-subpage page-title="$i18n{cupsPrintersTitle}">
+ <settings-cups-printers></settings-cups-printers>
+ </settings-subpage>
+ </template>
+</if>
+ <template is="dom-if" name="cloud-printers">
+ <settings-subpage page-title="$i18n{cloudPrintersTitle}">
+ <settings-cloud-printers prefs="{{prefs}}">
+ </settings-cloud-printers>
+ </settings-subpage>
+ </template>
+ </settings-animated-pages>
</template>
<script src="printing_page.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698