summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_navigator.h
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 01:30:49 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 01:30:49 +0000
commitfee320549deec4e68f2ac98beeebc87a5dfcc467 (patch)
tree1d7ff383ef347d0180b6b4705d57e23708915423 /chrome/browser/ui/browser_navigator.h
parent4e5572f5a91691d0112717ee93013f58e36a6d65 (diff)
downloadchromium_src-fee320549deec4e68f2ac98beeebc87a5dfcc467.zip
chromium_src-fee320549deec4e68f2ac98beeebc87a5dfcc467.tar.gz
chromium_src-fee320549deec4e68f2ac98beeebc87a5dfcc467.tar.bz2
retry r76329 with chromeos fix
Change the behavior of ignore_path in BrowserNavigator. use an enum instead. The enum controls whether to replace the path or leave it alone when bringing an already-open tab to the front. BUG=71472 TEST=included Review URL: http://codereview.chromium.org/6592058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_navigator.h')
-rw-r--r--chrome/browser/ui/browser_navigator.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h
index 2b726d0..c3f066a 100644
--- a/chrome/browser/ui/browser_navigator.h
+++ b/chrome/browser/ui/browser_navigator.h
@@ -122,9 +122,17 @@ struct NavigateParams {
// automatically.
bool show_window;
- // True if the paths of the target content's URL and |url| should be ignored
- // when locating a singleton tab.
- bool ignore_path;
+ // What to do with the path component of the URL for singleton navigations.
+ enum PathBehavior {
+ // Two URLs with differing paths are different.
+ RESPECT,
+ // Ignore path when finding existing tab, navigate to new URL.
+ IGNORE_AND_NAVIGATE,
+ // Ignore path when finding existing tab, don't navigate tab.
+ IGNORE_AND_STAY_PUT,
+ };
+ // Default is RESPECT.
+ PathBehavior path_behavior;
// [in] Specifies a Browser object where the navigation could occur or the
// tab could be added. Navigate() is not obliged to use this Browser if