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

Unified Diff: trunk/src/athena/wm/window_manager_impl.cc

Issue 404533002: Revert 283774 "Fix silly mistakes" (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | « trunk/src/athena/resources/athena_resources.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/athena/wm/window_manager_impl.cc
===================================================================
--- trunk/src/athena/wm/window_manager_impl.cc (revision 283780)
+++ trunk/src/athena/wm/window_manager_impl.cc (working copy)
@@ -23,6 +23,8 @@
WindowManagerImpl();
virtual ~WindowManagerImpl();
+ void Init() { InstallAccelerators(); }
+
void Layout();
// WindowManager:
@@ -40,7 +42,7 @@
void InstallAccelerators() {
const AcceleratorData accelerator_data[] = {
- {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
+ {TRIGGER_ON_PRESS, ui::VKEY_6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
AF_NONE},
};
AcceleratorManager::Get()->RegisterAccelerators(
@@ -114,7 +116,6 @@
container_->SetLayoutManager(new AthenaContainerLayoutManager);
container_->AddObserver(this);
instance = this;
- InstallAccelerators();
}
WindowManagerImpl::~WindowManagerImpl() {
« no previous file with comments | « trunk/src/athena/resources/athena_resources.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698