Index: chrome/browser/resources/options/options.js |
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js |
index 011223f72c31267a6fac949e2ab30246b3c224aa..6000086228412a45ab4d246169bc74023a7bcf24 100644 |
--- a/chrome/browser/resources/options/options.js |
+++ b/chrome/browser/resources/options/options.js |
@@ -226,12 +226,15 @@ function load() { |
Preferences.getInstance().initialize(); |
AutomaticSettingsResetBanner.getInstance().initialize(); |
OptionsPage.initialize(); |
+ PageManager.initialize(BrowserOptions.getInstance()); |
+ PageManager.addObserver(new uber.PageManagerObserver()); |
var pageName = PageManager.getPageNameFromPath(); |
// Still update history so that chrome://settings/nonexistant redirects |
// appropriately to chrome://settings/. If the URL matches, updateHistory_ |
// will avoid the extra replaceState. |
- PageManager.showPageByName(pageName, true, {replaceState: true}); |
+ var updateHistory = true; |
+ PageManager.showPageByName(pageName, updateHistory, {replaceState: true}); |
var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs'); |
for (var i = 0; i < subpagesNavTabs.length; i++) { |
@@ -240,6 +243,8 @@ function load() { |
}; |
} |
+ uber.onContentFrameLoaded(); |
+ |
window.setTimeout(function() { |
document.documentElement.classList.remove('loading'); |
chrome.send('onFinishedLoadingOptions'); |