3 files changed, 41 insertions, 7 deletions
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowMode.java b/shared/src/com/vaadin/shared/ui/window/WindowMode.java
new file mode 100644
index 0000000000..04af77a086
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/window/WindowMode.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.shared.ui.window;
+
+/**
+ * Determines the mode of the Window.
+ * <p>
+ * A window mode decides the size and position of the Window. It can be set to
+ * {@link #NORMAL} or {@link #MAXIMIZED}.
+ * 
+ * 
+ * @author Vaadin Ltd
+ * @since 7.1
+ */
+public enum WindowMode {
+    /**
+     * Normal mode. The window size and position is determined by the window
+     * state.
+     */
+    NORMAL,
+    /**
+     * Maximized mode. The window is positioned in the top left corner and fills
+     * the whole screen.
+     */
+    MAXIMIZED;
+}
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
index 0128adca40..cfb10ad86a 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
+++ b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
@@ -18,11 +18,10 @@ package com.vaadin.shared.ui.window;
 import com.vaadin.shared.annotations.Delayed;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.ui.ClickRpc;
-import com.vaadin.shared.ui.window.WindowState.DisplayState;
 
 public interface WindowServerRpc extends ClickRpc, ServerRpc {
 
     @Delayed(lastOnly = true)
-    public void windowDisplayStateChanged(DisplayState newState);
+    public void windowModeChanged(WindowMode newState);
 
 }
 \ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowState.java b/shared/src/com/vaadin/shared/ui/window/WindowState.java
index eb6f1c758a..5a2d2b81b0 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowState.java
+++ b/shared/src/com/vaadin/shared/ui/window/WindowState.java
@@ -22,10 +22,6 @@ public class WindowState extends PanelState {
         primaryStyleName = "v-window";
     }
 
-    public enum DisplayState {
-        NORMAL, MAXIMIZED;
-    }
-
     public boolean modal = false;
     public boolean resizable = true;
     public boolean resizeLazy = false;
@@ -33,5 +29,5 @@ public class WindowState extends PanelState {
     public boolean centered = false;;
     public int positionX = -1;
     public int positionY = -1;
-    public DisplayState displayState = DisplayState.NORMAL;
+    public WindowMode windowMode = WindowMode.NORMAL;
 }
 \ No newline at end of file