| Index: ash/wm/caption_buttons/frame_caption_button_container_view.cc
|
| diff --git a/ash/wm/caption_buttons/frame_caption_button_container_view.cc b/ash/wm/caption_buttons/frame_caption_button_container_view.cc
|
| index 3425afa45c3a32d7d80d91632673767d9ea8a4e8..5c024a0e8e347949f926451329813c7508f89d92 100644
|
| --- a/ash/wm/caption_buttons/frame_caption_button_container_view.cc
|
| +++ b/ash/wm/caption_buttons/frame_caption_button_container_view.cc
|
| @@ -9,7 +9,7 @@
|
| #include "ash/shell_delegate.h"
|
| #include "ash/wm/caption_buttons/alternate_frame_caption_button.h"
|
| #include "ash/wm/caption_buttons/frame_maximize_button.h"
|
| -#include "ash/wm/window_settings.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "grit/ash_resources.h"
|
| #include "grit/ui_strings.h" // Accessibility names
|
| #include "ui/base/hit_test.h"
|
| @@ -190,7 +190,7 @@ void FrameCaptionButtonContainerView::Layout() {
|
| // The new assets only make sense if the window is maximized or fullscreen
|
| // because we usually use a black header in this case.
|
| if ((frame_->IsMaximized() || frame_->IsFullscreen()) &&
|
| - wm::GetWindowSettings(
|
| + wm::GetWindowState(
|
| frame_->GetNativeWindow())->tracked_by_workspace()) {
|
| SetButtonImages(size_button_,
|
| IDR_AURA_WINDOW_MAXIMIZED_RESTORE2,
|
|
|