diff options
author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 19:17:44 +0000 |
---|---|---|
committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 19:17:44 +0000 |
commit | 591dffa8428e10000118206d45de1ce58e4420da (patch) | |
tree | 07f7fc6af7c27188bea958900cd4160971fe3e53 /chrome/browser/bookmarks | |
parent | a502a0467325aeaf299b41ba95b7b4b560096c5a (diff) | |
download | chromium_src-591dffa8428e10000118206d45de1ce58e4420da.zip chromium_src-591dffa8428e10000118206d45de1ce58e4420da.tar.gz chromium_src-591dffa8428e10000118206d45de1ce58e4420da.tar.bz2 |
Change BrowserList::GetLastActive to respect the profile for which it's launched in the bookmark utils.
BUG=86361
TEST=bookmark_utils tests remain unsullied.
Review URL: http://codereview.chromium.org/7205004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 439dec7..f4cc03a 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -126,6 +126,7 @@ int ChildURLCount(const BookmarkNode* node) { void OpenAllImpl(const BookmarkNode* node, WindowOpenDisposition initial_disposition, PageNavigator** navigator, + Profile* profile, bool* opened_url) { if (node->is_url()) { WindowOpenDisposition disposition; @@ -139,7 +140,7 @@ void OpenAllImpl(const BookmarkNode* node, *opened_url = true; // We opened the first URL which may have opened a new window or clobbered // the current page, reset the navigator just to be sure. - Browser* new_browser = BrowserList::GetLastActive(); + Browser* new_browser = BrowserList::GetLastActiveWithProfile(profile); if (new_browser) { TabContents* current_tab = new_browser->GetSelectedTabContents(); DCHECK(new_browser && current_tab); @@ -152,7 +153,8 @@ void OpenAllImpl(const BookmarkNode* node, for (int i = 0; i < node->child_count(); ++i) { const BookmarkNode* child_node = node->GetChild(i); if (child_node->is_url()) - OpenAllImpl(child_node, initial_disposition, navigator, opened_url); + OpenAllImpl(child_node, initial_disposition, navigator, profile, + opened_url); } } } @@ -383,7 +385,8 @@ void OpenAll(gfx::NativeWindow parent, bool opened_url = false; for (size_t i = 0; i < nodes.size(); ++i) - OpenAllImpl(nodes[i], initial_disposition, &navigator, &opened_url); + OpenAllImpl(nodes[i], initial_disposition, &navigator, profile, + &opened_url); } void OpenAll(gfx::NativeWindow parent, |