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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_views.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/ash/chrome_shell_delegate_views.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index 4b93c59d06ef1433137588d008ba486271347126..af202589316297ed868a0b5a10a1fd4b4fb1838b 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -199,8 +199,8 @@ void ChromeShellDelegate::Observe(int type,
// we should execute the startup code.
// If there are browsers open in the desktop, we create a browser window
// and open a new tab page, if session restore is not on.
- BrowserList* desktop_list = BrowserList::GetInstance(
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ BrowserList* desktop_list =
+ BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE);
if (desktop_list->empty()) {
// We pass a dummy command line here, because the browser is launched in
// silent-mode by the metro viewer process, which causes the
@@ -211,11 +211,9 @@ void ChromeShellDelegate::Observe(int type,
base::FilePath(),
dummy,
chrome::startup::IS_NOT_FIRST_RUN);
- startup_impl.Launch(
- ProfileManager::GetActiveUserProfile(),
- std::vector<GURL>(),
- true,
- chrome::HOST_DESKTOP_TYPE_ASH);
+ startup_impl.Launch(ProfileManager::GetActiveUserProfile(),
+ std::vector<GURL>(), true,
+ ui::HOST_DESKTOP_TYPE_ASH);
} else {
Browser* browser =
chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
@@ -225,8 +223,7 @@ void ChromeShellDelegate::Observe(int type,
}
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
chrome::AddTabAt(displayer.browser(), GURL(), -1, true);
}
break;

Powered by Google App Engine
This is Rietveld 408576698