diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 02:34:04 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 02:34:04 +0000 |
| commit | ab1773928ef4d27360a7e2dcb91d06f74d44d634 (patch) | |
| tree | 4628686182da1b59fd9ff1c720b34b33a46734fb /ash/wm/window_util.cc | |
| parent | f08238bd5502347aa3a261e24d36a5d6c20e1b86 (diff) | |
| download | chromium_src-ab1773928ef4d27360a7e2dcb91d06f74d44d634.zip chromium_src-ab1773928ef4d27360a7e2dcb91d06f74d44d634.tar.gz chromium_src-ab1773928ef4d27360a7e2dcb91d06f74d44d634.tar.bz2 | |
Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list.
The following changes are for removing TOGGLE_MAXIMIZED_* from Ash reserved actions list.
- Add ShellDelegate::ToggleMaximized
- Remove VKEY_F4 from browser accelerators list
Also added a browser test for ChromeShellDelegate::ToggleMaximized.
BUG=152265
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/11082002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_util.cc')
| -rw-r--r-- | ash/wm/window_util.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index 74c970f..b4c2a4d 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -100,6 +100,13 @@ void RestoreWindow(aura::Window* window) { window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); } +void ToggleMaximizedWindow(aura::Window* window) { + if (ash::wm::IsWindowMaximized(window)) + ash::wm::RestoreWindow(window); + else if (ash::wm::CanMaximizeWindow(window)) + ash::wm::MaximizeWindow(window); +} + void CenterWindow(aura::Window* window) { const gfx::Display display = gfx::Screen::GetDisplayNearestWindow(window); gfx::Rect center = display.work_area().Center(window->bounds().size()); |