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

Unified Diff: chrome/browser/resources/settings/about_page/detailed_build_info.html

Issue 2011703002: MD Settings: About page, hooking up channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@about_regulatory_info
Patch Set: Nit. Created 4 years, 7 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/about_page/detailed_build_info.html
diff --git a/chrome/browser/resources/settings/about_page/detailed_build_info.html b/chrome/browser/resources/settings/about_page/detailed_build_info.html
index 5fc6e841e060c4e43f38122030613aa36215646c..23dba44b7f23ef176a2a638c2c952b0949a6f19f 100644
--- a/chrome/browser/resources/settings/about_page/detailed_build_info.html
+++ b/chrome/browser/resources/settings/about_page/detailed_build_info.html
@@ -2,9 +2,11 @@
<link rel="import" href="/about_page/about_page_browser_proxy.html">
<link rel="import" href="/about_page/channel_switcher_dialog.html">
<link rel="import" href="/i18n_setup.html"
+<link rel="import" href="/icons.html">
dschuyler 2016/05/27 22:16:21 This will include the settings/icons.html and the
dpapad 2016/05/27 23:32:18 Done.
<link rel="import" href="/settings_shared_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
dschuyler 2016/05/27 22:16:21 Sort above paper-button. (move this up a line).
dpapad 2016/05/27 23:32:18 Done.
<dom-module id="settings-detailed-build-info">
<template>
@@ -31,8 +33,14 @@
<div class="secondary">[[currentlyOnChannelText_]]</div>
</div>
<div class="secondary-action">
- <paper-button class="secondary-button">Change channel</paper-button>
+ <paper-button on-tap="onChangeChannelTap_"
+ disabled="[[!canChangeChannel_]]">
+ $i18n{aboutChangeChannel}</paper-button>
dschuyler 2016/05/27 22:16:21 Please indent the $18n two more spaces -or- move <
dpapad 2016/05/27 23:32:18 Done.
+ <iron-icon icon="cr:domain" hidden="[[canChangeChannel_]]"</iron-icon>
</div>
+ <template is="dom-if" if="[[showChannelSwitcherDialog_]]" restamp>
+ <settings-channel-switcher-dialog></settings-channel-switcher-dialog>
+ </template>
</div>
<div class="settings-box two-line"
hidden$="[[!shouldShowVersion_(versionInfo_.arcVersion)]]">

Powered by Google App Engine
This is Rietveld 408576698