Revert 283774 "Fix silly mistakes"

> Fix silly mistakes
>  * The original CL was totally broken. sorry about that.
>   *add missing ui_resources.
> 
> BUG=None
> TBR=sadrul@chromium.org
> 
> Review URL: https://codereview.chromium.org/401613004

TBR=oshima@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283781 0039d316-1c4b-4281-b951-d872f2087c98

athena/resources/athena_resources.gyp

@@ -14,7 +14,6 @@
         '../../apps/shell/app_shell.gyp:app_shell_pak',
         '../../ash/ash_resources.gyp:ash_resources',
         '../../content/content_resources.gyp:content_resources',
-        '../../ui/resources/ui_resources.gyp:ui_resources',
         '../../webkit/webkit_resources.gyp:webkit_resources',
         '../../webkit/webkit_resources.gyp:webkit_strings',
       ],
@@ -25,7 +24,6 @@
             '<(PRODUCT_DIR)/app_shell.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
           ],

athena/wm/window_manager_impl.cc

@@ -23,6 +23,8 @@ class WindowManagerImpl : public WindowManager,
   WindowManagerImpl();
   virtual ~WindowManagerImpl();
 
+  void Init() { InstallAccelerators(); }
+
   void Layout();
 
   // WindowManager:
@@ -40,7 +42,7 @@ class WindowManagerImpl : public WindowManager,
 
   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 @@ WindowManagerImpl::WindowManagerImpl()
   container_->SetLayoutManager(new AthenaContainerLayoutManager);
   container_->AddObserver(this);
   instance = this;
-  InstallAccelerators();
 }
 
 WindowManagerImpl::~WindowManagerImpl() {