| Index: ash/wm/workspace/colored_window_controller.cc
|
| diff --git a/ash/wm/workspace/colored_window_controller.cc b/ash/wm/workspace/colored_window_controller.cc
|
| index 81339b54f7c83a3837c3032431bb0706dd2c94ac..bffff5486fa0115dc002d94c035f33216e93b841 100644
|
| --- a/ash/wm/workspace/colored_window_controller.cc
|
| +++ b/ash/wm/workspace/colored_window_controller.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ash/wm/workspace/colored_window_controller.h"
|
|
|
| #include "ash/shell_window_ids.h"
|
| -#include "ash/wm/window_settings.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/gfx/canvas.h"
|
| @@ -65,7 +65,7 @@ ColoredWindowController::ColoredWindowController(aura::Window* parent,
|
| widget->Init(params);
|
| // Do this so the parent doesn't attempt to enforce any bounds constraints on
|
| // us.
|
| - wm::GetWindowSettings(widget->GetNativeView())->SetTrackedByWorkspace(false);
|
| + wm::GetWindowState(widget->GetNativeView())->SetTrackedByWorkspace(false);
|
| widget->GetNativeView()->SetProperty(aura::client::kAnimationsDisabledKey,
|
| true);
|
| widget->GetNativeView()->SetName(window_name);
|
|
|