diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:55:14 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:55:14 +0000 |
| commit | 82404cd25e38e79bca2fc5544dfe656d8c6bdd4e (patch) | |
| tree | 8f55bf4b61958f1bf5a40fbae92e06f19079f3e9 /chrome/browser/ui/browser_navigator.cc | |
| parent | c045b1a761ab1a77fb374dbe9ef5c1d0aaa8789d (diff) | |
| download | chromium_src-82404cd25e38e79bca2fc5544dfe656d8c6bdd4e.zip chromium_src-82404cd25e38e79bca2fc5544dfe656d8c6bdd4e.tar.gz chromium_src-82404cd25e38e79bca2fc5544dfe656d8c6bdd4e.tar.bz2 | |
Change navigator to open non-incognito pages in current page
for settings/bookmark manager, and use bookmark_utils in gtk.
Pass browser as PageNavigator in GTK instead of TabContents.
R=jhawkins@chromium.org
BUG=83819
TEST=BrowserNavigatorTest.Disposition_Settings_UseNonIncognitoWindowForBookmark
Review URL: http://codereview.chromium.org/7331044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_navigator.cc')
| -rw-r--r-- | chrome/browser/ui/browser_navigator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 81ae69b..6352440 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -96,7 +96,8 @@ void AdjustNavigateParamsForURL(browser::NavigateParams* params) { Profile* profile = params->browser ? params->browser->profile() : params->profile; - if (profile->IsOffTheRecord() && !Profile::IsGuestSession()) { + if ((profile->IsOffTheRecord() && !Profile::IsGuestSession()) || + params->disposition == OFF_THE_RECORD) { profile = profile->GetOriginalProfile(); params->disposition = SINGLETON_TAB; |