| Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
|
| diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
|
| index 6e5d89cd13234bb41e7214a16f79450a04be7f05..8ba36e527823adf2b97020be1d92966d349de438 100644
|
| --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
|
| +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
|
| @@ -145,7 +145,7 @@ void ChromeNativeAppWindowViewsAuraAsh::InitializeWindow(
|
| if (app_window->window_type_is_panel()) {
|
| // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
|
| // The type should have been initialized for mash below, via mus_properties.
|
| - if (!chrome::IsRunningInMash())
|
| + if (!ash_util::IsRunningInMash())
|
| window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP_PANEL);
|
| } else {
|
| window->SetProperty(aura::client::kAppType,
|
| @@ -162,7 +162,7 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforeWidgetInit(
|
| if (create_params.is_ime_window) {
|
| // Put ime windows into the ime window container on the primary display.
|
| int container_id = ash::kShellWindowId_ImeWindowParentContainer;
|
| - if (chrome::IsRunningInMash()) {
|
| + if (ash_util::IsRunningInMash()) {
|
| init_params->mus_properties
|
| [ui::mojom::WindowManager::kContainerId_InitProperty] =
|
| mojo::ConvertTo<std::vector<uint8_t>>(container_id);
|
| @@ -190,7 +190,7 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
|
| init_params,
|
| widget);
|
|
|
| - if (chrome::IsRunningInMash()) {
|
| + if (ash_util::IsRunningInMash()) {
|
| // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
|
| init_params
|
| ->mus_properties[ui::mojom::WindowManager::kShelfItemType_Property] =
|
| @@ -318,7 +318,7 @@ ChromeNativeAppWindowViewsAuraAsh::CreateNonClientFrameView(
|
| if (IsFrameless())
|
| return CreateNonStandardAppFrame();
|
|
|
| - if (chrome::IsRunningInMash())
|
| + if (ash_util::IsRunningInMash())
|
| return ChromeNativeAppWindowViews::CreateNonClientFrameView(widget);
|
|
|
| if (app_window()->window_type_is_panel()) {
|
| @@ -362,7 +362,7 @@ void ChromeNativeAppWindowViewsAuraAsh::SetFullscreen(int fullscreen_types) {
|
| ash::wm::GetWindowState(widget()->GetNativeWindow());
|
| window_state->set_hide_shelf_when_fullscreen(fullscreen_types !=
|
| AppWindow::FULLSCREEN_TYPE_OS);
|
| - if (!chrome::IsRunningInMash()) {
|
| + if (!ash_util::IsRunningInMash()) {
|
| DCHECK(ash::Shell::HasInstance());
|
| ash::Shell::GetInstance()->UpdateShelfVisibility();
|
| }
|
|
|