Index: chrome/browser/resources/settings/settings_ui/settings_ui.js |
diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js |
index 910bddc3e576e85a8ebbdffc636dd243ff2c66d0..52307933182e0026b5b1776e4d7fbef7f130da58 100644 |
--- a/chrome/browser/resources/settings/settings_ui/settings_ui.js |
+++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js |
@@ -10,6 +10,12 @@ |
* |
* <settings-ui prefs="{{prefs}}"></settings-ui> |
*/ |
+cr.exportPath('settings'); |
+assert(!settings.defaultResourceLoaded, |
+ 'settings_ui.js run twice. You probably have an invalid import.'); |
+/** Global defined when the main Settings script runs. */ |
+settings.defaultResourceLoaded = true; |
+ |
Polymer({ |
is: 'settings-ui', |
@@ -23,6 +29,7 @@ Polymer({ |
directionDelegate: { |
observer: 'directionDelegateChanged_', |
type: Object, |
+ value: new settings.DirectionDelegateImpl(), |
}, |
/** @private {boolean} */ |
@@ -38,6 +45,11 @@ Polymer({ |
pageVisibility_: Object, |
}, |
+ /** @override */ |
+ created: function() { |
+ settings.initializeRouteFromUrl(); |
+ }, |
+ |
/** |
* @override |
* @suppress {es5Strict} Object literals cannot contain duplicate keys in ES5 |