chrome/chrome.gyp - Issue 173044: This changelist represents the necessary merger of two others:...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome.gyp

Issue 173044: This changelist represents the necessary merger of two others:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 11 years, 4 months 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

Index: chrome/chrome.gyp

===================================================================

--- chrome/chrome.gyp (revision 23684)

+++ chrome/chrome.gyp (working copy)

@@ -433,8 +433,6 @@

'common/chrome_switches.h',

'common/classfactory.cc',

'common/classfactory.h',

- 'common/cocoa_utils.mm',

- 'common/cocoa_utils.h',

'common/common_glue.cc',

'common/common_param_traits.cc',

'common/common_param_traits.h',

@@ -866,6 +864,8 @@

'browser/cocoa/download_util_mac.mm',

'browser/cocoa/encoding_menu_controller_delegate_mac.h',

'browser/cocoa/encoding_menu_controller_delegate_mac.mm',

+ 'browser/cocoa/event_utils.h',

+ 'browser/cocoa/event_utils.mm',

'browser/cocoa/find_bar_bridge.h',

'browser/cocoa/find_bar_bridge.mm',

'browser/cocoa/find_bar_cocoa_controller.h',

@@ -3819,6 +3819,7 @@

'browser/cocoa/download_shelf_mac_unittest.mm',

'browser/cocoa/download_shelf_view_unittest.mm',

'browser/cocoa/download_util_mac_unittest.mm',

+ 'browser/cocoa/event_utils_unittest.mm',

'browser/cocoa/find_bar_bridge_unittest.mm',

'browser/cocoa/find_bar_cocoa_controller_unittest.mm',

'browser/cocoa/find_bar_view_unittest.mm',

@@ -3844,6 +3845,8 @@

'browser/cocoa/tab_strip_controller_unittest.mm',

'browser/cocoa/tab_strip_view_unittest.mm',

'browser/cocoa/tab_view_unittest.mm',

+ 'browser/cocoa/test_event_utils.h',

+ 'browser/cocoa/test_event_utils.mm',

'browser/cocoa/throbber_view_unittest.mm',

'browser/cocoa/toolbar_button_cell_unittest.mm',

'browser/cocoa/toolbar_controller_unittest.mm',

@@ -3972,7 +3975,6 @@

'common/bzip2_unittest.cc',

'common/child_process_logging_mac_unittest.mm',

'common/chrome_plugin_unittest.cc',

- 'common/cocoa_utils_unittest.mm',

'common/common_param_traits_unittest.cc',

'common/extensions/extension_unittest.cc',

'common/extensions/url_pattern_unittest.cc',

« no previous file with comments | « chrome/browser/cocoa/test_event_utils.mm ('k') | chrome/common/cocoa_utils.h » ('j') | no next file with comments »