Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: athena/wm/window_manager_impl.cc

Issue 401613004: Fix silly mistakes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_impl.cc
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index 6c1bc8736f5ae28b0d180da6a4fbe75d9a93c40f..8f43a5e162b2f11afa8d5af7b368b49a90785f2d 100644
--- a/athena/wm/window_manager_impl.cc
+++ b/athena/wm/window_manager_impl.cc
@@ -23,8 +23,6 @@ class WindowManagerImpl : public WindowManager,
WindowManagerImpl();
virtual ~WindowManagerImpl();
- void Init() { InstallAccelerators(); }
-
void Layout();
// WindowManager:
@@ -42,7 +40,7 @@ class WindowManagerImpl : public WindowManager,
void InstallAccelerators() {
const AcceleratorData accelerator_data[] = {
- {TRIGGER_ON_PRESS, ui::VKEY_6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
+ {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
AF_NONE},
};
AcceleratorManager::Get()->RegisterAccelerators(
@@ -116,6 +114,7 @@ WindowManagerImpl::WindowManagerImpl()
container_->SetLayoutManager(new AthenaContainerLayoutManager);
container_->AddObserver(this);
instance = this;
+ InstallAccelerators();
}
WindowManagerImpl::~WindowManagerImpl() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698