Merge 34812 - Add the rightclick context menu for Browser actions and Page...

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 1362 matching lines @@
         'browser/download/save_package.h',
         'browser/download/save_types.h',
         'browser/encoding_menu_controller.cc',
         'browser/encoding_menu_controller.h',
         'browser/extensions/convert_user_script.cc',
         'browser/extensions/convert_user_script.h',
         'browser/extensions/crashed_extension_infobar.cc',
         'browser/extensions/crashed_extension_infobar.h',
         'browser/extensions/crx_installer.cc',
         'browser/extensions/crx_installer.h',
+        'browser/extensions/extension_action_context_menu_model.cc',
+        'browser/extensions/extension_action_context_menu_model.h',
         'browser/extensions/extension_bookmarks_module.cc',
         'browser/extensions/extension_bookmarks_module.h',
         'browser/extensions/extension_bookmarks_module_constants.cc',
         'browser/extensions/extension_bookmarks_module_constants.h',
         'browser/extensions/extension_browser_actions_api.cc',
         'browser/extensions/extension_browser_actions_api.h',
         'browser/extensions/extension_creator.cc',
         'browser/extensions/extension_creator.h',
         'browser/extensions/extension_disabled_infobar_delegate.cc',
         'browser/extensions/extension_disabled_infobar_delegate.h',
@@ skipping 927 matching lines @@
         'browser/views/download_started_animation_win.cc',
         'browser/views/dropdown_bar_host.cc',
         'browser/views/dropdown_bar_host.h',
         'browser/views/dropdown_bar_host_gtk.cc',
         'browser/views/dropdown_bar_host_win.cc',
         'browser/views/dropdown_bar_view.h',
         'browser/views/edit_search_engine_dialog.cc',
         'browser/views/edit_search_engine_dialog.h',
         'browser/views/event_utils.cc',
         'browser/views/event_utils.h',
+        'browser/views/extensions/extension_action_context_menu.cc',
+        'browser/views/extensions/extension_action_context_menu.h',
         'browser/views/extensions/extension_install_prompt.cc',
         'browser/views/extensions/extension_installed_bubble.cc',
         'browser/views/extensions/extension_installed_bubble.h',
         'browser/views/extensions/extension_popup.cc',
         'browser/views/extensions/extension_popup.h',
         'browser/views/extensions/extension_shelf.cc',
         'browser/views/extensions/extension_shelf.h',
         'browser/views/extensions/extension_view.cc',
         'browser/views/extensions/extension_view.h',
         'browser/views/external_protocol_dialog.cc',
@@ skipping 4755 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: