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

Unified Diff: chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.cc
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 152a3f259278c9db616fc02e798f8c33d03772f1..c0a4fb0c88e6ec389aacd0690852672673212752 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -55,7 +55,7 @@ namespace {
// Shows the app list for |desktop_type| and returns the app list's window.
gfx::NativeWindow ShowAppListAndGetNativeWindow(
- chrome::HostDesktopType desktop_type) {
+ ui::HostDesktopType desktop_type) {
AppListService* app_list_service = AppListService::Get(desktop_type);
app_list_service->Show();
return app_list_service->GetAppListWindow();
@@ -283,9 +283,9 @@ WebContents* OpenApplicationTab(const AppLaunchParams& launch_params,
}
// On Chrome OS the host desktop type for a browser window is always set to
- // HOST_DESKTOP_TYPE_ASH. On Windows 8 it is only the case for Chrome ASH
+ // ui::HOST_DESKTOP_TYPE_ASH. On Windows 8 it is only the case for Chrome ASH
// in metro mode.
- if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
+ if (browser->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH) {
// In ash, LAUNCH_FULLSCREEN launches in the OpenApplicationWindow function
// i.e. it should not reach here.
DCHECK(launch_type != extensions::LAUNCH_TYPE_FULLSCREEN);

Powered by Google App Engine
This is Rietveld 408576698