Merge 180012

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 156 matching lines @@
         'system/brightness/tray_brightness.cc',
         'system/brightness/tray_brightness.h',
         'system/chromeos/enterprise/enterprise_domain_observer.h',
         'system/chromeos/enterprise/tray_enterprise.h',
         'system/chromeos/enterprise/tray_enterprise.cc',
         'system/chromeos/keyboard_brightness_controller.cc',
         'system/chromeos/keyboard_brightness_controller.h',
         'system/chromeos/network/network_detailed_view.h',
         'system/chromeos/network/network_icon.cc',
         'system/chromeos/network/network_icon.h',
+        'system/chromeos/network/network_icon_animation.cc',
+        'system/chromeos/network/network_icon_animation.h',
         'system/chromeos/network/network_icon_animation_observer.h',
         'system/chromeos/network/network_list_detailed_view.cc',
         'system/chromeos/network/network_list_detailed_view.h',
         'system/chromeos/network/network_list_detailed_view_base.cc',
         'system/chromeos/network/network_list_detailed_view_base.h',
         'system/chromeos/network/network_observer.h',
         'system/chromeos/network/network_state_list_detailed_view.cc',
         'system/chromeos/network/network_state_list_detailed_view.h',
         'system/chromeos/network/tray_network.cc',
         'system/chromeos/network/tray_network.h',
@@ skipping 553 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }