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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.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/views/apps/chrome_native_app_window_views_win.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
index 8ff89ed9708ce4652180891ddfb61ea7b9a68fa4..1c3d549dee439920d1562987867e70f2691426f7 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
@@ -44,7 +44,7 @@ void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {
// Metro mode can only be done by launching a process from Metro mode itself.
// This is done for launching apps, but not regular activations.
if (IsRunningInAsh() &&
- chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
+ chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_NATIVE) {
chrome::ActivateMetroChrome();
}
}
@@ -59,9 +59,9 @@ bool ChromeNativeAppWindowViewsWin::IsRunningInAsh() {
views::Widget* widget =
implicit_cast<views::WidgetDelegate*>(this)->GetWidget();
- chrome::HostDesktopType host_desktop_type =
+ ui::HostDesktopType host_desktop_type =
chrome::GetHostDesktopTypeForNativeWindow(widget->GetNativeWindow());
- return host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH;
+ return host_desktop_type == ui::HOST_DESKTOP_TYPE_ASH;
}
void ChromeNativeAppWindowViewsWin::EnsureCaptionStyleSet() {
@@ -87,7 +87,7 @@ void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
extensions::AppWindow* any_existing_window =
extensions::AppWindowRegistry::Get(browser_context)
->GetCurrentAppWindowForApp(extension_id);
- chrome::HostDesktopType desktop_type;
+ ui::HostDesktopType desktop_type;
if (any_existing_window) {
desktop_type = chrome::GetHostDesktopTypeForNativeWindow(
any_existing_window->GetNativeWindow());
@@ -102,7 +102,7 @@ void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
desktop_type = chrome::GetActiveDesktop();
}
}
- if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
+ if (desktop_type == ui::HOST_DESKTOP_TYPE_ASH)
init_params->context = ash::Shell::GetPrimaryRootWindow();
else
init_params->native_widget = new AppWindowDesktopNativeWidgetAuraWin(this);

Powered by Google App Engine
This is Rietveld 408576698