Finish merging r32589 from the trunk to the 249 branch

chrome/chrome.gyp

 # Copyright (c) 2009 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,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 1142 matching lines @@
         'browser/cocoa/encoding_menu_controller_delegate_mac.mm',
         'browser/cocoa/event_utils.h',
         'browser/cocoa/event_utils.mm',
         'browser/cocoa/extension_install_prompt.mm',
         'browser/cocoa/extension_shelf_controller.h',
         'browser/cocoa/extension_shelf_controller.mm',
         'browser/cocoa/extension_view_mac.h',
         'browser/cocoa/extension_view_mac.mm',
         'browser/cocoa/extensions/browser_actions_controller.h',
         'browser/cocoa/extensions/browser_actions_controller.mm',
+        'browser/cocoa/extensions/extension_popup_controller.h',
+        'browser/cocoa/extensions/extension_popup_controller.mm',
         'browser/cocoa/external_protocol_dialog.h',
         'browser/cocoa/external_protocol_dialog.mm',
         'browser/cocoa/fast_resize_view.h',
         'browser/cocoa/fast_resize_view.mm',
         'browser/cocoa/file_metadata.h',
         'browser/cocoa/file_metadata.mm',
         'browser/cocoa/find_bar_bridge.h',
         'browser/cocoa/find_bar_bridge.mm',
         'browser/cocoa/find_bar_cocoa_controller.h',
         'browser/cocoa/find_bar_cocoa_controller.mm',
@@ skipping 3401 matching lines @@
         'browser/cocoa/cocoa_test_helper.h',
         'browser/cocoa/cocoa_test_helper.mm',
         'browser/cocoa/command_observer_bridge_unittest.mm',
         'browser/cocoa/custom_home_pages_model_unittest.mm',
         'browser/cocoa/delayedmenu_button_unittest.mm',
         'browser/cocoa/download_shelf_mac_unittest.mm',
         'browser/cocoa/download_shelf_view_unittest.mm',
         'browser/cocoa/download_util_mac_unittest.mm',
         'browser/cocoa/edit_search_engine_cocoa_controller_unittest.mm',
         'browser/cocoa/extension_shelf_controller_unittest.mm',
+        'browser/cocoa/extensions/extension_popup_controller_unittest.mm',
         'browser/cocoa/event_utils_unittest.mm',
         'browser/cocoa/fast_resize_view_unittest.mm',
         'browser/cocoa/find_bar_bridge_unittest.mm',
         'browser/cocoa/find_bar_cocoa_controller_unittest.mm',
         'browser/cocoa/find_bar_text_field_unittest.mm',
         'browser/cocoa/find_bar_text_field_cell_unittest.mm',
         'browser/cocoa/find_bar_view_unittest.mm',
         'browser/cocoa/find_pasteboard_unittest.mm',
         'browser/cocoa/focus_tracker_unittest.mm',
         'browser/cocoa/fullscreen_window_unittest.mm',
@@ skipping 2501 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: