Revert 162140 - ash : Decouple power button controller and session state controller.

ash/ash.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 309 matching lines @@
         'wm/resize_shadow.cc',
         'wm/resize_shadow.h',
         'wm/resize_shadow_controller.cc',
         'wm/resize_shadow_controller.h',
         'wm/root_window_layout_manager.cc',
         'wm/root_window_layout_manager.h',
         'wm/screen_dimmer.cc',
         'wm/screen_dimmer.h',
         'wm/session_state_animator.cc',
         'wm/session_state_animator.h',
-        'wm/session_state_controller.cc',
-        'wm/session_state_controller.h',
         'wm/shadow.cc',
         'wm/shadow.h',
         'wm/shadow_controller.cc',
         'wm/shadow_controller.h',
         'wm/shadow_types.cc',
         'wm/shadow_types.h',
         'wm/shelf_layout_manager.cc',
         'wm/shelf_layout_manager.h',
         'wm/shelf_types.h',
         'wm/stacking_controller.cc',
@@ skipping 348 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }