summaryrefslogtreecommitdiffstats
path: root/ash/wm/workspace_controller.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 23:15:54 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 23:15:54 +0000
commit56943d672efb9f6341b9327485da20ccc7f96823 (patch)
tree03edc35557a39a22ae46f1bf1dc1db78fb6357f1 /ash/wm/workspace_controller.h
parentc0cfb2ff854d11bd0514cda699945de4053fc204 (diff)
downloadchromium_src-56943d672efb9f6341b9327485da20ccc7f96823.zip
chromium_src-56943d672efb9f6341b9327485da20ccc7f96823.tar.gz
chromium_src-56943d672efb9f6341b9327485da20ccc7f96823.tar.bz2
Fixes bugs that resulted in problems with double clicking to maximize
vertically/horizontally: . Workspace was initially setting a restore bounds even if the window was normal. This confused the maximize logic. To fix this I've simplified the workspace code so that it uses BaseLayoutManager to manage the restore bounds. . Under X a double click results in press-drag-release, press-drag-release. The second press starts a window drag resizer as well as maximizing. This means that when we press the drag we end up trying to move the window and things snap around. . Don't toggle size if already maximized. BUG=117201 TEST=covered by unit tests R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9624014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller.h')
-rw-r--r--ash/wm/workspace_controller.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index fb45cc2..9cffc2f 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -9,7 +9,6 @@
#include "ash/ash_export.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/aura/root_window_observer.h"
#include "ui/aura/window_observer.h"
#include "ui/base/models/simple_menu_model.h"
@@ -38,7 +37,6 @@ class WorkspaceManager;
// various workspace pieces: WorkspaceManager, WorkspaceLayoutManager and
// WorkspaceEventFilter.
class ASH_EXPORT WorkspaceController :
- public aura::RootWindowObserver,
public aura::WindowObserver,
public ui::SimpleMenuModel::Delegate {
public:
@@ -55,12 +53,6 @@ class ASH_EXPORT WorkspaceController :
// Shows the menu allowing you to configure various aspects of workspaces.
void ShowMenu(views::Widget* widget, const gfx::Point& location);
- // aura::RootWindowObserver overrides:
- virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE;
-
- // aura::RootWindowObserver overrides:
- virtual void OnScreenWorkAreaInsetsChanged() OVERRIDE;
-
// aura::WindowObserver overrides:
virtual void OnWindowPropertyChanged(aura::Window* window,
const void* key,