| Index: ash/wm/workspace_controller.h
|
| diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
|
| index e34e111dc72d01db86409b11ed70b11e977cc314..92045828335f40bbfd9c973e5ecf87cbf5588cde 100644
|
| --- a/ash/wm/workspace_controller.h
|
| +++ b/ash/wm/workspace_controller.h
|
| @@ -8,7 +8,7 @@
|
| #include <memory>
|
|
|
| #include "ash/ash_export.h"
|
| -#include "ash/wm/workspace/workspace_types.h"
|
| +#include "ash/wm/common/workspace/workspace_types.h"
|
| #include "base/macros.h"
|
|
|
| namespace aura {
|
| @@ -36,7 +36,7 @@ class ASH_EXPORT WorkspaceController {
|
| virtual ~WorkspaceController();
|
|
|
| // Returns the current window state.
|
| - WorkspaceWindowState GetWindowState() const;
|
| + wm::WorkspaceWindowState GetWindowState() const;
|
|
|
| void SetShelf(ShelfLayoutManager* shelf);
|
|
|
|
|