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

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

Issue 1701793002: Remove HostDesktopType from startup browser creator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-24
Patch Set: mac Created 4 years, 10 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
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 997c1b4d23e20da39c895ed476b5f54d3efe5e45..2f5652c5af5d86d4fb80a9feb4801ac1431048cb 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.h
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h
@@ -11,7 +11,6 @@
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/startup/startup_tab.h"
#include "chrome/browser/ui/startup/startup_types.h"
#include "url/gurl.h"
@@ -57,15 +56,13 @@ class StartupBrowserCreatorImpl {
// already running and the user wants to launch another instance.
bool Launch(Profile* profile,
const std::vector<GURL>& urls_to_open,
- bool process_startup,
- chrome::HostDesktopType desktop_type);
+ bool process_startup);
// Convenience for OpenTabsInBrowser that converts |urls| into a set of
// Tabs.
Browser* OpenURLsInBrowser(Browser* browser,
bool process_startup,
- const std::vector<GURL>& urls,
- chrome::HostDesktopType desktop_type);
+ const std::vector<GURL>& urls);
private:
FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs);
@@ -84,8 +81,7 @@ class StartupBrowserCreatorImpl {
// browser.
Browser* OpenTabsInBrowser(Browser* browser,
bool process_startup,
- const StartupTabs& tabs,
- chrome::HostDesktopType desktop_type);
+ const StartupTabs& tabs);
// If the process was launched with the web application command line flags,
// e.g. --app=http://www.google.com/ or --app_id=... return true.
@@ -108,8 +104,7 @@ class StartupBrowserCreatorImpl {
// or invoke ProcessSpecifiedURLs.
// . Open the urls directly.
void ProcessLaunchURLs(bool process_startup,
- const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type);
+ const std::vector<GURL>& urls_to_open);
// Does the following:
// . If the user's startup pref is to restore the last session (or the
@@ -118,8 +113,7 @@ class StartupBrowserCreatorImpl {
// . 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);
+ bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open);
// Invoked from either ProcessLaunchURLs or ProcessStartupURLs to handle
// processing of URLs where the behavior is common between process startup
@@ -132,8 +126,7 @@ class StartupBrowserCreatorImpl {
//
// If any tabs were opened, the Browser which was created is returned.
// Otherwise null is returned and the caller must create a new browser.
- Browser* ProcessSpecifiedURLs(const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type);
+ Browser* ProcessSpecifiedURLs(const std::vector<GURL>& urls_to_open);
// Adds a Tab to |tabs| for each url in |urls| that doesn't already exist
// in |tabs|.

Powered by Google App Engine
This is Rietveld 408576698