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); |