Chromium Code Reviews| Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc |
| =================================================================== |
| --- chrome/browser/ui/startup/startup_browser_creator_impl.cc (revision 161954) |
| +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc (working copy) |
| @@ -617,12 +617,14 @@ |
| std::vector<GURL> adjust_urls = urls_to_open; |
| if (adjust_urls.empty()) { |
| AddStartupURLs(&adjust_urls); |
| + if (StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| + profile_, adjust_urls)) |
| + return; |
| } else if (!command_line_.HasSwitch(switches::kOpenInNewWindow)) { |
| // Always open a list of urls in a window on the native desktop. |
| browser = browser::FindBrowserWithProfile(profile_, |
| chrome::HOST_DESKTOP_TYPE_NATIVE); |
| } |
| - |
| // This will launch a browser; prevent session restore. |
| in_synchronous_profile_launch = true; |
| browser = OpenURLsInBrowser(browser, process_startup, adjust_urls); |
| @@ -1033,3 +1035,12 @@ |
| backup_show_home_button)); |
| } |
| } |
| + |
| +#if !defined(OS_WIN) || defined(USE_AURA) |
| +// static |
| +bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| + Profile* profile, const std::vector<GURL>& startup_urls) { |
|
sky
2012/10/16 22:06:15
Same thing about wrapping here. Also, why the USE_
ananta
2012/10/16 22:14:58
Fixed the wrapping. Regarding AURA this code path
|
| + return false; |
| +} |
| +#endif |
| + |