diff options
| -rw-r--r-- | chrome/browser/resources/options2/options_page.js | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/uber/uber.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/resources/options2/options_page.js b/chrome/browser/resources/options2/options_page.js index 2af423a..e6ed4bd 100644 --- a/chrome/browser/resources/options2/options_page.js +++ b/chrome/browser/resources/options2/options_page.js @@ -220,7 +220,7 @@ cr.define('options', function() { historyFunction.call(window.history, {pageName: page.name}, page.title, - '/' + page.name); + '/' + page.name + window.location.hash); // Update tab title. this.setTitle_(page.title); diff --git a/chrome/browser/resources/uber/uber.js b/chrome/browser/resources/uber/uber.js index 69a89ed..8ddafb8 100644 --- a/chrome/browser/resources/uber/uber.js +++ b/chrome/browser/resources/uber/uber.js @@ -41,8 +41,11 @@ cr.define('uber', function() { // HACK(dbeam): This makes the assumption that any second part to a path // will result in needing background navigation. We shortcut it to avoid // flicker on load. - if (params.path && params.id == 'settings') + // HACK(csilv): Search URLs aren't overlays, special case them. + if (params.id == 'settings' && params.path && + params.path.indexOf('search') != 0) { backgroundNavigation(); + } } /** |