Index: chrome/browser/resources/settings/prefs/prefs.js |
diff --git a/chrome/browser/resources/settings/prefs/prefs.js b/chrome/browser/resources/settings/prefs/prefs.js |
index b68ccea3c5c9b26ee7608800145cf458189e34af..c2caa4c6899bf95c6c45c48c5c725313673e7925 100644 |
--- a/chrome/browser/resources/settings/prefs/prefs.js |
+++ b/chrome/browser/resources/settings/prefs/prefs.js |
@@ -16,6 +16,16 @@ |
* @group Chrome Settings Elements |
* @element cr-settings-a11y-page |
*/ |
+ |
+/** |
+ * TODO(stevenjb/michaelpg): Remove this once we stop using Object.observer. |
Dan Beam
2015/08/28 20:32:26
observer -> observe
stevenjb
2015/08/28 20:57:16
Done.
|
+ * (that CL is in review, otherwise this doesn't really belong here). |
+ * @param {!Object} object |
+ * @param {!Function} callback |
+ * @param {!Array<string>=} opt_acceptList |
+ */ |
+Object.observe = function(object, callback, opt_acceptList) {}; |
Dan Beam
2015/08/28 20:32:26
why can't we pull in es7_observe.js?
stevenjb
2015/08/28 20:57:16
Didn't seem worth any effort for something that's
stevenjb
2015/08/28 20:59:27
Also, I can wait for Michael's patch before landin
|
+ |
(function() { |
'use strict'; |
@@ -44,7 +54,8 @@ |
/** |
* Called when prefs in the underlying Chrome pref store are changed. |
- * @param {!Array<!PrefObject>} prefs The prefs that changed. |
+ * @param {!Array<!chrome.settingsPrivate.PrefObject>} prefs The prefs that |
+ * changed. |
* @private |
*/ |
onPrefsChanged_: function(prefs) { |
@@ -53,7 +64,7 @@ |
/** |
* Called when prefs are fetched from settingsPrivate. |
- * @param {!Array<!PrefObject>} prefs |
+ * @param {!Array<!chrome.settingsPrivate.PrefObject>} prefs |
* @private |
*/ |
onPrefsFetched_: function(prefs) { |
@@ -66,7 +77,7 @@ |
/** |
* Updates the settings model with the given prefs. |
- * @param {!Array<!PrefObject>} prefs |
+ * @param {!Array<!chrome.settingsPrivate.PrefObject>} prefs |
* @param {boolean} shouldObserve Whether each of the prefs should be |
* observed. |
* @private |