Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 450006: Finish merging r32589 from the trunk to the 249 branch (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 33265)
+++ chrome/chrome.gyp (working copy)
@@ -1160,6 +1160,8 @@
'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',
@@ -4581,6 +4583,7 @@
'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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698