Revert 283774 "Fix silly mistakes"

trunk/src/athena/wm/window_manager_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/public/window_manager.h"
 
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/window_overview_mode.h"
 #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 {
 
 class WindowManagerImpl : public WindowManager,
                           public WindowOverviewModeDelegate,
                           public aura::WindowObserver,
                           public AcceleratorHandler {
  public:
   WindowManagerImpl();
   virtual ~WindowManagerImpl();
 
+  void Init() { InstallAccelerators(); }
+
   void Layout();
 
   // WindowManager:
   virtual void ToggleOverview() OVERRIDE {
     if (overview_)
       overview_.reset();
     else
       overview_ = WindowOverviewMode::Create(container_.get(), this);
   }
 
  private:
   enum Command {
     COMMAND_TOGGLE_OVERVIEW,
   };
 
   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(
         accelerator_data, arraysize(accelerator_data), this);
   }
 
   // WindowOverviewModeDelegate:
   virtual void OnSelectWindow(aura::Window* window) OVERRIDE {
     CHECK_EQ(container_.get(), window->parent());
     container_->StackChildAtTop(window);
@@ skipping 53 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager);
 };
 
 WindowManagerImpl::WindowManagerImpl()
     : container_(
           ScreenManager::Get()->CreateDefaultContainer("MainContainer")) {
   container_->SetLayoutManager(new AthenaContainerLayoutManager);
   container_->AddObserver(this);
   instance = this;
-  InstallAccelerators();
 }
 
 WindowManagerImpl::~WindowManagerImpl() {
   if (container_)
     container_->RemoveObserver(this);
   container_.reset();
   instance = NULL;
 }
 
 void WindowManagerImpl::Layout() {
@@ skipping 21 matching lines @@
 }
 
 // static
 void WindowManager::Shutdown() {
   DCHECK(instance);
   delete instance;
   DCHECK(!instance);
 }
 
 }  // namespace athena