| Index: chrome/browser/ui/views/apps/native_app_window_views.cc
|
| diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc
|
| index 1a647520a1dbb20aa101a2e5d39c32723f48c747..538042703820680dd7583884f2f11c0034a40c9c 100644
|
| --- a/chrome/browser/ui/views/apps/native_app_window_views.cc
|
| +++ b/chrome/browser/ui/views/apps/native_app_window_views.cc
|
| @@ -44,7 +44,7 @@
|
| #include "ash/shell.h"
|
| #include "ash/wm/custom_frame_view_ash.h"
|
| #include "ash/wm/panels/panel_frame_view.h"
|
| -#include "ash/wm/window_settings.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "chrome/browser/ui/ash/ash_util.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/root_window.h"
|
| @@ -285,7 +285,7 @@ void NativeAppWindowViews::InitializePanelWindow(
|
| preferred_size_.width(),
|
| preferred_size_.height());
|
| aura::Window* native_window = GetNativeWindow();
|
| - ash::wm::GetWindowSettings(native_window)->set_panel_attached(false);
|
| + ash::wm::GetWindowState(native_window)->set_panel_attached(false);
|
| native_window->SetDefaultParentByRootWindow(
|
| native_window->GetRootWindow(), native_window->GetBoundsInScreen());
|
| window_->SetBounds(window_bounds);
|
| @@ -412,7 +412,7 @@ bool NativeAppWindowViews::IsAlwaysOnTop() const {
|
| if (!shell_window_->window_type_is_panel())
|
| return false;
|
| #if defined(USE_ASH)
|
| - return ash::wm::GetWindowSettings(window_->GetNativeWindow())->
|
| + return ash::wm::GetWindowState(window_->GetNativeWindow())->
|
| panel_attached();
|
| #else
|
| return true;
|
| @@ -750,8 +750,7 @@ bool NativeAppWindowViews::IsDetached() const {
|
| if (!shell_window_->window_type_is_panel())
|
| return false;
|
| #if defined(USE_ASH)
|
| - return !ash::wm::GetWindowSettings(window_->GetNativeWindow())->
|
| - panel_attached();
|
| + return !ash::wm::GetWindowState(window_->GetNativeWindow())->panel_attached();
|
| #else
|
| return false;
|
| #endif
|
|
|