Commit 9efed282 authored by oshima@chromium.org's avatar oshima@chromium.org

Maximize only normal/popup window

 Used to maximize menu as well.

Toggle home card when ctrl-l is pressed.

BUG=380438
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/332463002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276582 0039d316-1c4b-4281-b951-d872f2087c98
parent d6984e84
......@@ -87,7 +87,10 @@ class HomeCardImpl : public HomeCard, public AcceleratorHandler {
virtual bool OnAcceleratorFired(int command_id,
const ui::Accelerator& accelerator) OVERRIDE {
DCHECK_EQ(COMMAND_SHOW_HOME_CARD, command_id);
home_card_widget_->Show();
if (home_card_widget_->IsVisible())
home_card_widget_->Hide();
else
home_card_widget_->Show();
return true;
}
......
......@@ -4,4 +4,5 @@ include_rules = [
"+ui/compositor",
"+ui/events",
"+ui/gfx",
"+ui/wm",
]
......@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "ui/aura/layout_manager.h"
#include "ui/aura/window.h"
#include "ui/wm/public/window_types.h"
namespace athena {
namespace {
......@@ -124,7 +125,9 @@ void WindowManagerImpl::Layout() {
for (aura::Window::Windows::const_iterator iter = children.begin();
iter != children.end();
++iter) {
(*iter)->SetBounds(bounds);
if ((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL ||
(*iter)->type() == ui::wm::WINDOW_TYPE_POPUP)
(*iter)->SetBounds(bounds);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment