| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 8c9cfdfbddd2a1ddd13c245f4b5794a391ea192c..eedf7a711e781ea86a1518b8ccb2ea612b0674c5 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -325,21 +325,21 @@
|
| 'system/chromeos/audio/tray_audio_chromeos.h',
|
| 'system/chromeos/audio/tray_audio_delegate_chromeos.cc',
|
| 'system/chromeos/audio/tray_audio_delegate_chromeos.h',
|
| - 'system/chromeos/enterprise/enterprise_domain_observer.h',
|
| 'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
|
| 'system/chromeos/bluetooth/bluetooth_notification_controller.h',
|
| 'system/chromeos/brightness/brightness_controller_chromeos.cc',
|
| 'system/chromeos/brightness/brightness_controller_chromeos.h',
|
| 'system/chromeos/brightness/tray_brightness.cc',
|
| 'system/chromeos/brightness/tray_brightness.h',
|
| - 'system/chromeos/enterprise/tray_enterprise.h',
|
| + 'system/chromeos/enterprise/enterprise_domain_observer.h',
|
| 'system/chromeos/enterprise/tray_enterprise.cc',
|
| + 'system/chromeos/enterprise/tray_enterprise.h',
|
| 'system/chromeos/keyboard_brightness_controller.cc',
|
| 'system/chromeos/keyboard_brightness_controller.h',
|
| - 'system/chromeos/label_tray_view.h',
|
| 'system/chromeos/label_tray_view.cc',
|
| - 'system/chromeos/managed/tray_locally_managed_user.h',
|
| + 'system/chromeos/label_tray_view.h',
|
| 'system/chromeos/managed/tray_locally_managed_user.cc',
|
| + 'system/chromeos/managed/tray_locally_managed_user.h',
|
| 'system/chromeos/network/network_connect.cc',
|
| 'system/chromeos/network/network_connect.h',
|
| 'system/chromeos/network/network_detailed_view.h',
|
| @@ -441,6 +441,9 @@
|
| 'system/tray/fixed_sized_scroll_view.h',
|
| 'system/tray/hover_highlight_view.cc',
|
| 'system/tray/hover_highlight_view.h',
|
| + 'system/tray/media_security/media_capture_observer.h',
|
| + 'system/tray/media_security/multi_profile_media_tray_item.cc',
|
| + 'system/tray/media_security/multi_profile_media_tray_item.h',
|
| 'system/tray/special_popup_row.cc',
|
| 'system/tray/special_popup_row.h',
|
| 'system/tray/system_tray.cc',
|
| @@ -729,6 +732,9 @@
|
| ['exclude', 'display/display_configurator_animation.h'],
|
| ['exclude', 'display/resolution_notification_controller.cc'],
|
| ['exclude', 'display/resolution_notification_controller.h'],
|
| + ['exclude', 'system/tray/media_security/media_capture_observer.h'],
|
| + ['exclude', 'system/tray/media_security/multi_profile_media_tray_item.cc'],
|
| + ['exclude', 'system/tray/media_security/multi_profile_media_tray_item.h'],
|
| ],
|
| }],
|
| ],
|
| @@ -966,6 +972,7 @@
|
| 'system/chromeos/tray_display_unittest.cc',
|
| 'system/date/date_view_unittest.cc',
|
| 'system/overview/overview_button_tray_unittest.cc',
|
| + 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
|
| 'system/tray/system_tray_unittest.cc',
|
| 'system/tray/tray_details_view_unittest.cc',
|
| 'system/user/tray_user_unittest.cc',
|
| @@ -1031,6 +1038,7 @@
|
| ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'],
|
| ['exclude', 'sticky_keys/sticky_keys_overlay_unittest.cc'],
|
| ['exclude', 'sticky_keys/sticky_keys_unittest.cc'],
|
| + ['exclude', 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc'],
|
| ['exclude', 'autoclick/autoclick_unittest.cc'],
|
| ],
|
| 'sources': [
|
| @@ -1117,8 +1125,6 @@
|
| 'sources': [
|
| '../content/app/startup_helper_win.cc',
|
| '../ui/views/test/test_views_delegate.cc',
|
| - 'session/session_state_delegate_stub.cc',
|
| - 'session/session_state_delegate_stub.h',
|
| 'shell/app_list.cc',
|
| 'shell/bubble.cc',
|
| 'shell/content_client/shell_browser_main_parts.cc',
|
|
|