diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:43:08 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:43:08 +0000 |
| commit | 0edcdec2f2284d50d710e31243a5b08205bd4b75 (patch) | |
| tree | 8c2cf20e15fb74aa9343d0879beae94d865c5d76 /chrome/browser/lifetime | |
| parent | f60429563b7af7258f331db6cfac6ce6e9a1795b (diff) | |
| download | chromium_src-0edcdec2f2284d50d710e31243a5b08205bd4b75.zip chromium_src-0edcdec2f2284d50d710e31243a5b08205bd4b75.tar.gz chromium_src-0edcdec2f2284d50d710e31243a5b08205bd4b75.tar.bz2 | |
Make sure that the created browser is displayed when chrome::FindOrCreateTabbedBrowser() is used
BUG=177542
TEST=None
Review URL: https://codereview.chromium.org/36333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/lifetime')
| -rw-r--r-- | chrome/browser/lifetime/browser_close_manager.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/lifetime/browser_close_manager.cc b/chrome/browser/lifetime/browser_close_manager.cc index fed7d84..51a9df4 100644 --- a/chrome/browser/lifetime/browser_close_manager.cc +++ b/chrome/browser/lifetime/browser_close_manager.cc @@ -12,11 +12,11 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" +#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/web_contents.h" @@ -117,10 +117,9 @@ void BrowserCloseManager::OnReportDownloadsCancellable(bool proceed) { DownloadService* download_service = DownloadServiceFactory::GetForBrowserContext(*it); if (download_service->NonMaliciousDownloadCount() > 0) { - Browser* browser = - chrome::FindOrCreateTabbedBrowser(*it, chrome::GetActiveDesktop()); - DCHECK(browser); - chrome::ShowDownloads(browser); + chrome::ScopedTabbedBrowserDisplayer displayer( + *it, chrome::GetActiveDesktop()); + chrome::ShowDownloads(displayer.browser()); } } } |