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

chrome/chrome_browser_chromeos.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_chromeos',
       'type': 'static_library',
@@ skipping 517 matching lines @@
         'browser/chromeos/options/vpn_config_view.cc',
         'browser/chromeos/options/vpn_config_view.h',
         'browser/chromeos/options/wifi_config_view.cc',
         'browser/chromeos/options/wifi_config_view.h',
         'browser/chromeos/options/wimax_config_view.cc',
         'browser/chromeos/options/wimax_config_view.h',
         'browser/chromeos/power/brightness_observer.cc',
         'browser/chromeos/power/brightness_observer.h',
         'browser/chromeos/power/output_observer.cc',
         'browser/chromeos/power/output_observer.h',
+        'browser/chromeos/power/power_button_controller_delegate_chromeos.cc',
+        'browser/chromeos/power/power_button_controller_delegate_chromeos.h',
         'browser/chromeos/power/power_button_observer.cc',
         'browser/chromeos/power/power_button_observer.h',
         'browser/chromeos/power/resume_observer.cc',
         'browser/chromeos/power/resume_observer.h',
         'browser/chromeos/power/screen_dimming_observer.cc',
         'browser/chromeos/power/screen_dimming_observer.h',
         'browser/chromeos/power/screen_lock_observer.cc',
         'browser/chromeos/power/screen_lock_observer.h',
-        'browser/chromeos/power/session_state_controller_delegate_chromeos.cc',
-        'browser/chromeos/power/session_state_controller_delegate_chromeos.h',
         'browser/chromeos/power/user_activity_notifier.cc',
         'browser/chromeos/power/user_activity_notifier.h',
         'browser/chromeos/power/video_activity_notifier.cc',
         'browser/chromeos/power/video_activity_notifier.h',
         'browser/chromeos/preferences.cc',
         'browser/chromeos/preferences.h',
         'browser/chromeos/prerender_condition_network.cc',
         'browser/chromeos/prerender_condition_network.h',
         'browser/chromeos/process_proxy/process_output_watcher.cc',
         'browser/chromeos/process_proxy/process_output_watcher.h',
@@ skipping 199 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/chromeos/drive/drive.proto' ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/drive',
         'proto_out_dir': 'chrome/browser/chromeos/drive',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }