| Index: chrome/browser/ui/views/apps/native_app_window_views_win.cc
|
| diff --git a/chrome/browser/ui/views/apps/native_app_window_views_win.cc b/chrome/browser/ui/views/apps/native_app_window_views_win.cc
|
| index 37c4cf5c1b20946ba87cc52d7fb8af70a21d6ab2..a6d0fbabb88823ffa8a0ce591ecf31a88e16f5f7 100644
|
| --- a/chrome/browser/ui/views/apps/native_app_window_views_win.cc
|
| +++ b/chrome/browser/ui/views/apps/native_app_window_views_win.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "chrome/browser/ui/views/apps/native_app_window_views_win.h"
|
|
|
| -#include "apps/shell_window.h"
|
| -#include "apps/shell_window_registry.h"
|
| +#include "apps/app_window.h"
|
| +#include "apps/app_window_registry.h"
|
| #include "ash/shell.h"
|
| #include "chrome/browser/apps/per_app_settings_service.h"
|
| #include "chrome/browser/apps/per_app_settings_service_factory.h"
|
| @@ -38,9 +38,9 @@ void NativeAppWindowViewsWin::OnBeforeWidgetInit(
|
| views::Widget::InitParams* init_params, views::Widget* widget) {
|
| // If an app has any existing windows, ensure new ones are created on the
|
| // same desktop.
|
| - apps::ShellWindow* any_existing_window =
|
| - apps::ShellWindowRegistry::Get(browser_context())
|
| - ->GetCurrentShellWindowForApp(extension()->id());
|
| + apps::AppWindow* any_existing_window =
|
| + apps::AppWindowRegistry::Get(browser_context())
|
| + ->GetCurrentAppWindowForApp(extension()->id());
|
| chrome::HostDesktopType desktop_type;
|
| if (any_existing_window) {
|
| desktop_type = chrome::GetHostDesktopTypeForNativeWindow(
|
|
|