diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 22:14:09 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 22:14:09 +0000 |
| commit | 7b5889271403aeca3ae850c0d99b474a048cebee (patch) | |
| tree | 8937a7a0865fcd9821debb4f38b75c9b7a3a423d | |
| parent | a79be1ff74b51103636093374277c5a043dbdaac (diff) | |
| download | chromium_src-7b5889271403aeca3ae850c0d99b474a048cebee.zip chromium_src-7b5889271403aeca3ae850c0d99b474a048cebee.tar.gz chromium_src-7b5889271403aeca3ae850c0d99b474a048cebee.tar.bz2 | |
[uber page] Fix support for settings search URLs.
BUG=119674
TEST=See bug for details.
Review URL: https://chromiumcodereview.appspot.com/9839070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128592 0039d316-1c4b-4281-b951-d872f2087c98
| -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(); + } } /** |