Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/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 222 matching lines @@
         'root_window_controller.h',
         'root_window_settings.cc',
         'root_window_settings.h',
         'rotator/screen_rotation.cc',
         'rotator/screen_rotation.h',
         'scoped_target_root_window.cc',
         'scoped_target_root_window.h',
         'screen_util.cc',
         'screen_util.h',
         'screenshot_delegate.h',
-        'session/session_state_delegate.h',
-        'session/session_state_observer.cc',
-        'session/session_state_observer.h',
-        'session/user_info.h',
+        'session_state_delegate.h',
+        'session_state_observer.cc',
+        'session_state_observer.h',
         'shelf/app_list_button.cc',
         'shelf/app_list_button.h',
         'shelf/app_list_shelf_item_delegate.cc',
         'shelf/app_list_shelf_item_delegate.h',
         'shelf/background_animator.cc',
         'shelf/background_animator.h',
         'shelf/overflow_bubble.cc',
         'shelf/overflow_bubble.h',
         'shelf/overflow_bubble_view.cc',
         'shelf/overflow_bubble_view.h',
@@ skipping 677 matching lines @@
         'ime/candidate_view_unittest.cc',
         'ime/candidate_window_view_unittest.cc',
         'ime/input_method_menu_item_unittest.cc',
         'ime/input_method_menu_manager_unittest.cc',
         'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
         'keyboard_overlay/keyboard_overlay_view_unittest.cc',
         'magnifier/magnification_controller_unittest.cc',
         'root_window_controller_unittest.cc',
         'screen_util_unittest.cc',
         'screensaver/screensaver_view_unittest.cc',
-        'session/session_state_delegate_stub.cc',
-        'session/session_state_delegate_stub.h',
+        'session_state_delegate_stub.cc',
+        'session_state_delegate_stub.h',
         'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
         'shelf/shelf_layout_manager_unittest.cc',
         'shelf/shelf_model_unittest.cc',
         'shelf/shelf_navigator_unittest.cc',
         'shelf/shelf_tooltip_manager_unittest.cc',
         'shelf/shelf_unittest.cc',
         'shelf/shelf_view_unittest.cc',
         'shelf/shelf_widget_unittest.cc',
         'shelf/shelf_window_watcher_unittest.cc',
         'shell/app_list.cc',
@@ skipping 174 matching lines @@
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/views/examples/examples.gyp:views_examples_lib',
         '../ui/views/examples/examples.gyp:views_examples_with_content_lib',
         '../ui/views/views.gyp:views',
         '../ui/views/views.gyp:views_test_support',
         'ash',
         'ash_resources',
         'ash_with_content',
       ],
       'sources': [
-        'session/session_state_delegate_stub.cc',
-        'session/session_state_delegate_stub.h',
+        'session_state_delegate_stub.cc',
+        'session_state_delegate_stub.h',
         'shell/app_list.cc',
         'shell/bubble.cc',
         'shell/content_client/shell_browser_main_parts.cc',
         'shell/content_client/shell_browser_main_parts.h',
         'shell/content_client/shell_content_browser_client.cc',
         'shell/content_client/shell_content_browser_client.h',
         'shell/content_client/shell_main_delegate.cc',
         'shell/content_client/shell_main_delegate.h',
         'shell/context_menu.cc',
         'shell/context_menu.h',
@@ skipping 35 matching lines @@
         }],
         ['chromeos==1', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
         }],
       ],
     },
   ],
 }