| Index: ash/wm/workspace/workspace.h
|
| diff --git a/ash/wm/workspace/workspace.h b/ash/wm/workspace/workspace.h
|
| index 0ad230b1265ae4530d1d6099d71986ad0ca41ee6..4b8423b48096b0712155c3d8deff53bd52838d90 100644
|
| --- a/ash/wm/workspace/workspace.h
|
| +++ b/ash/wm/workspace/workspace.h
|
| @@ -26,14 +26,14 @@ class WorkspaceEventHandler;
|
| class WorkspaceLayoutManager;
|
| class WorkspaceManager;
|
|
|
| -// Workspace is used to maintain either a single maximized windows (including
|
| +// Workspace is used to maintain either a single fullscreen windows (including
|
| // transients and other windows) or any number of windows (for the
|
| // desktop). Workspace is used by WorkspaceManager to manage a set of windows.
|
| class ASH_EXPORT Workspace {
|
| public:
|
| Workspace(WorkspaceManager* manager,
|
| aura::Window* parent,
|
| - bool is_maximized);
|
| + bool is_fullscreen);
|
| ~Workspace();
|
|
|
| // Returns the topmost activatable window. This corresponds to the most
|
| @@ -43,7 +43,7 @@ class ASH_EXPORT Workspace {
|
| // Resets state. This should be used before destroying the Workspace.
|
| aura::Window* ReleaseWindow();
|
|
|
| - bool is_maximized() const { return is_maximized_; }
|
| + bool is_fullscreen() const { return is_fullscreen_; }
|
|
|
| aura::Window* window() { return window_; }
|
|
|
| @@ -60,16 +60,16 @@ class ASH_EXPORT Workspace {
|
| WorkspaceManager* workspace_manager() { return workspace_manager_; }
|
|
|
| // Returns true if the Workspace should be moved to pending. This is true
|
| - // if there are no visible maximized windows.
|
| + // if there are no visible fullscreen windows.
|
| bool ShouldMoveToPending() const;
|
|
|
| - // Returns the number of maximized windows (including minimized windows that
|
| - // would be maximized on restore). This does not consider visibility.
|
| - int GetNumMaximizedWindows() const;
|
| + // Returns the number of fullscreen windows (including minimized windows that
|
| + // would be fullscreen on restore). This does not consider visibility.
|
| + int GetNumFullscreenWindows() const;
|
|
|
| private:
|
| - // Is this a workspace for maximized windows?
|
| - const bool is_maximized_;
|
| + // Is this a workspace for fullscreen windows?
|
| + const bool is_fullscreen_;
|
|
|
| WorkspaceManager* workspace_manager_;
|
|
|
|
|