summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 19:54:11 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 19:54:11 +0000
commitc9938e6d17e8464ce8577dccb98e19e7e5515cf0 (patch)
treed677ea1af85b257f135974c65adb9130e054769a /chrome
parent6a1d7d7ebc60dccc5705e1b80a6a746a17c64ef8 (diff)
downloadchromium_src-c9938e6d17e8464ce8577dccb98e19e7e5515cf0.zip
chromium_src-c9938e6d17e8464ce8577dccb98e19e7e5515cf0.tar.gz
chromium_src-c9938e6d17e8464ce8577dccb98e19e7e5515cf0.tar.bz2
Fixes a regression were showing a link brought a browser when to front
when it shouldn't have. BUG=8730 TEST=see bug Review URL: http://codereview.chromium.org/46054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/bookmarks/bookmark_utils.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index c9214b4..3fbbbb9 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -318,7 +318,10 @@ void OpenAll(gfx::NativeWindow parent,
if (!browser || !browser->GetSelectedTabContents()) {
navigator = &navigator_impl;
} else {
- browser->window()->Activate();
+ if (initial_disposition != NEW_WINDOW &&
+ initial_disposition != OFF_THE_RECORD) {
+ browser->window()->Activate();
+ }
navigator = browser->GetSelectedTabContents();
}
}