| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 23255)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -1223,6 +1223,8 @@
|
| 'browser/input_window_dialog_win.cc',
|
| 'browser/jankometer.cc',
|
| 'browser/jankometer.h',
|
| + 'browser/jumplist.cc',
|
| + 'browser/jumplist.h',
|
| 'browser/jsmessage_box_handler.cc',
|
| 'browser/jsmessage_box_handler.h',
|
| 'browser/keychain_mac.cc',
|
| @@ -2251,6 +2253,7 @@
|
| 'browser/history_view.cc',
|
| 'browser/ime_input.cc',
|
| 'browser/importer/ie_importer.cc',
|
| + 'browser/jumplist.cc',
|
| 'browser/memory_details.cc',
|
| 'browser/modal_html_dialog_delegate.cc',
|
| 'browser/sandbox_policy.cc',
|
|
|
| Property changes on: chrome\chrome.gyp
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/chrome/chrome.gyp:r21522
|
|
|
|
|