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

Side by Side Diff: chrome/browser/resources/settings/device_page/device_page.js

Issue 2273273003: Update strings for ash palette and rename options/settings files. (Closed)
Patch Set: A few more string changes Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview 'settings-device-page' is the settings page for device and 6 * @fileoverview 'settings-device-page' is the settings page for device and
7 * peripheral settings. 7 * peripheral settings.
8 */ 8 */
9 Polymer({ 9 Polymer({
10 is: 'settings-device-page', 10 is: 'settings-device-page',
(...skipping 17 matching lines...) Expand all
28 value: false, 28 value: false,
29 }, 29 },
30 30
31 /** @private */ 31 /** @private */
32 hasTouchpad_: { 32 hasTouchpad_: {
33 type: Boolean, 33 type: Boolean,
34 value: false, 34 value: false,
35 }, 35 },
36 36
37 /** @private */ 37 /** @private */
38 noteAllowed_: { 38 stylusAllowed_: {
39 type: Boolean, 39 type: Boolean,
40 value: function() { 40 value: function() {
41 return loadTimeData.getBoolean('noteAllowed'); 41 return loadTimeData.getBoolean('stylusAllowed');
42 }, 42 },
43 readOnly: true, 43 readOnly: true,
44 }, 44 },
45 }, 45 },
46 46
47 observers: [ 47 observers: [
48 'pointersChanged_(hasMouse_, hasTouchpad_)', 48 'pointersChanged_(hasMouse_, hasTouchpad_)',
49 ], 49 ],
50 50
51 ready: function() { 51 ready: function() {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 * @private 94 * @private
95 */ 95 */
96 onKeyboardTap_: function() { 96 onKeyboardTap_: function() {
97 settings.navigateTo(settings.Route.KEYBOARD); 97 settings.navigateTo(settings.Route.KEYBOARD);
98 }, 98 },
99 99
100 /** 100 /**
101 * Handler for tapping the Keyboard settings menu item. 101 * Handler for tapping the Keyboard settings menu item.
102 * @private 102 * @private
103 */ 103 */
104 onNoteTap_: function() { 104 onStylusTap_: function() {
105 settings.navigateTo(settings.Route.NOTES); 105 settings.navigateTo(settings.Route.STYLUS);
106 }, 106 },
107 107
108 /** 108 /**
109 * Handler for tapping the Display settings menu item. 109 * Handler for tapping the Display settings menu item.
110 * @private 110 * @private
111 */ 111 */
112 onDisplayTap_: function() { 112 onDisplayTap_: function() {
113 settings.navigateTo(settings.Route.DISPLAY); 113 settings.navigateTo(settings.Route.DISPLAY);
114 }, 114 },
115 115
(...skipping 16 matching lines...) Expand all
132 * Leaves the pointer subpage if all pointing devices are detached. 132 * Leaves the pointer subpage if all pointing devices are detached.
133 * @private 133 * @private
134 */ 134 */
135 checkPointerSubpage_: function() { 135 checkPointerSubpage_: function() {
136 if (!this.hasMouse_ && !this.hasTouchpad_ && 136 if (!this.hasMouse_ && !this.hasTouchpad_ &&
137 settings.getCurrentRoute() == settings.Route.POINTERS) { 137 settings.getCurrentRoute() == settings.Route.POINTERS) {
138 settings.navigateTo(settings.Route.DEVICE); 138 settings.navigateTo(settings.Route.DEVICE);
139 } 139 }
140 }, 140 },
141 }); 141 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698