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

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

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index ecbc5dc81b1829f603ecab69608efbbcdea3efe3..1450a066d3c0d7e8ad70d63697f097cfef923015 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -293,7 +293,7 @@ StartupBrowserCreatorImpl::~StartupBrowserCreatorImpl() {
bool StartupBrowserCreatorImpl::Launch(Profile* profile,
const std::vector<GURL>& urls_to_open,
bool process_startup,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
UMA_HISTOGRAM_COUNTS_100("Startup.BrowserLaunchURLCount",
static_cast<base::HistogramBase::Sample>(urls_to_open.size()));
RecordRapporOnStartupURLs(urls_to_open);
@@ -318,7 +318,7 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
params.current_directory = cur_dir_;
// If we are being launched from the command line, default to native
// desktop.
- params.desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
+ params.desktop_type = ui::HOST_DESKTOP_TYPE_NATIVE;
::OpenApplicationWithReenablePrompt(params);
return true;
}
@@ -487,7 +487,7 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(Profile* profile) {
void StartupBrowserCreatorImpl::ProcessLaunchURLs(
bool process_startup,
const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
// If we're starting up in "background mode" (no open browser window) then
// don't open any browser windows, unless kAutoLaunchAtStartup is also
// specified.
@@ -555,7 +555,7 @@ void StartupBrowserCreatorImpl::ProcessLaunchURLs(
} else if (!command_line_.HasSwitch(switches::kOpenInNewWindow)) {
// Always open a list of urls in a window on the native desktop.
browser = chrome::FindTabbedBrowser(profile_, false,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ ui::HOST_DESKTOP_TYPE_NATIVE);
}
// This will launch a browser; prevent session restore.
StartupBrowserCreator::in_synchronous_profile_launch_ = true;
@@ -567,7 +567,7 @@ void StartupBrowserCreatorImpl::ProcessLaunchURLs(
bool StartupBrowserCreatorImpl::ProcessStartupURLs(
const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
VLOG(1) << "StartupBrowserCreatorImpl::ProcessStartupURLs";
SessionStartupPref pref =
StartupBrowserCreator::GetSessionStartupPref(command_line_, profile_);
@@ -622,7 +622,7 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs(
}
// The startup code only executes for browsers launched in desktop mode.
- // i.e. HOST_DESKTOP_TYPE_NATIVE. Ash should never get here.
+ // i.e. ui::HOST_DESKTOP_TYPE_NATIVE. Ash should never get here.
Browser* browser = SessionRestore::RestoreSession(
profile_, NULL, desktop_type, restore_behavior, adjusted_urls);
@@ -650,7 +650,7 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs(
Browser* StartupBrowserCreatorImpl::ProcessSpecifiedURLs(
const std::vector<GURL>& urls_to_open,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
SessionStartupPref pref =
StartupBrowserCreator::GetSessionStartupPref(command_line_, profile_);
StartupTabs tabs;
@@ -721,7 +721,7 @@ Browser* StartupBrowserCreatorImpl::OpenURLsInBrowser(
Browser* browser,
bool process_startup,
const std::vector<GURL>& urls,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
StartupTabs tabs;
UrlsToTabs(urls, &tabs);
return OpenTabsInBrowser(browser, process_startup, tabs, desktop_type);
@@ -731,7 +731,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
Browser* browser,
bool process_startup,
const StartupTabs& tabs,
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
DCHECK(!tabs.empty());
// If we don't yet have a profile, try to use the one we're given from

Powered by Google App Engine
This is Rietveld 408576698