Revert 133691 because it accidentally reverted revs 133686 and 133684.

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',
   },
 
@@ skipping 99 matching lines @@
         'screen_ash.cc',
         'screen_ash.h',
         'screenshot_delegate.h',
         'shell.cc',
         'shell.h',
         'shell_context_menu.cc',
         'shell_context_menu.h',
         'shell_delegate.h',
         'shell_factory.h',
         'shell_window_ids.h',
-        'status_area/status_area_view.cc',
-        'status_area/status_area_view.h',
         'system/audio/audio_observer.h',
         'system/audio/tray_volume.cc',
         'system/audio/tray_volume.h',
         'system/bluetooth/bluetooth_observer.h',
         'system/bluetooth/tray_bluetooth.cc',
         'system/bluetooth/tray_bluetooth.h',
         'system/brightness/brightness_observer.h',
         'system/brightness/brightness_control_delegate.h',
         'system/brightness/tray_brightness.cc',
         'system/brightness/tray_brightness.h',
@@ skipping 13 matching lines @@
         'system/power/power_supply_status.h',
         'system/power/tray_power.cc',
         'system/power/tray_power.h',
         'system/settings/tray_settings.cc',
         'system/settings/tray_settings.h',
         'system/tray/system_tray.cc',
         'system/tray/system_tray.h',
         'system/tray/system_tray_delegate.h',
         'system/tray/system_tray_item.cc',
         'system/tray/system_tray_item.h',
+        'system/tray/system_tray_widget_delegate.cc',
+        'system/tray/system_tray_widget_delegate.h',
         'system/tray/tray_constants.cc',
         'system/tray/tray_constants.h',
         'system/tray/tray_empty.cc',
         'system/tray/tray_empty.h',
         'system/tray/tray_image_item.cc',
         'system/tray/tray_image_item.h',
         'system/tray/tray_item_more.cc',
         'system/tray/tray_item_more.h',
         'system/tray/tray_item_view.cc',
         'system/tray/tray_item_view.h',
@@ skipping 343 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }