Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.h

Issue 1044523002: Linux: Fix regression with --kiosk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/startup/startup_browser_creator_impl.h
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h
index 8103e208e2145bb205fba476f4540029cfd4c912..5836902557eafb44972aaa53a5283e9c8f94a97c 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.h
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h
@@ -101,19 +101,19 @@ class StartupBrowserCreatorImpl {
// . If |process_startup| is false, restore the last session if necessary,
// or invoke ProcessSpecifiedURLs.
// . Open the urls directly.
- void ProcessLaunchURLs(bool process_startup,
- const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type);
+ // Returens the Browser that processed |urls_to_open|.
Peter Kasting 2015/03/27 22:18:00 Returns
+ Browser* ProcessLaunchURLs(bool process_startup,
+ const std::vector<GURL>& urls_to_open,
+ chrome::HostDesktopType desktop_type);
// Does the following:
// . If the user's startup pref is to restore the last session (or the
// command line flag is present to force using last session), it is
// restored.
// . Otherwise invoke ProcessSpecifiedURLs
- // If a browser was created, true is returned. Otherwise returns false and
- // the caller must create a new browser.
- bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type);
+ // Returns a pointer to a Browser if one was created, otherwise nullptr.
+ Browser* ProcessStartupURLs(const std::vector<GURL>& urls_to_open,
+ chrome::HostDesktopType desktop_type);
// Invoked from either ProcessLaunchURLs or ProcessStartupURLs to handle
// processing of URLs where the behavior is common between process startup
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698