diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 22:17:34 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 22:17:34 +0000 |
| commit | a0695a9dad94dba3cda52852f5c68f336678e8d6 (patch) | |
| tree | f3bf66aeb54a449eb00f6a8e4860ec52757c0ac4 | |
| parent | 3e34e7536fe6395d5f95c51bc48aaed40fc2b7af (diff) | |
| download | chromium_src-a0695a9dad94dba3cda52852f5c68f336678e8d6.zip chromium_src-a0695a9dad94dba3cda52852f5c68f336678e8d6.tar.gz chromium_src-a0695a9dad94dba3cda52852f5c68f336678e8d6.tar.bz2 | |
Catch up chrome.gyp with files from recent changes:
* browser/extensions/extension_shelf.{cc,h} (Windows only)
* browser/views/chrome_views_delegated.{cc,h}
* renderer/mock_keyboard_driver_win.{cc,h}
* browser/debugger/devtools_sanity_unittest.cc (Windows only)
* views/widget/default_theme_provider.{cc,h}
Also make 'browser' depend on 'views' and export that dependency to
targets that depend on 'browser' (on Windows only, at least for now).
Review URL: http://codereview.chromium.org/113302
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15908 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index ee8e41e..28845f6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -877,6 +877,8 @@ 'browser/extensions/extension_process_manager.h', 'browser/extensions/extension_protocols.cc', 'browser/extensions/extension_protocols.h', + 'browser/extensions/extension_shelf.cc', + 'browser/extensions/extension_shelf.h', 'browser/extensions/extension_tabs_module.cc', 'browser/extensions/extension_tabs_module.h', 'browser/extensions/extension_view.cc', @@ -1373,6 +1375,8 @@ 'browser/views/bookmark_table_view.h', 'browser/views/bug_report_view.cc', 'browser/views/bug_report_view.h', + 'browser/views/chrome_views_delegate.cc', + 'browser/views/chrome_views_delegate.h', 'browser/views/clear_browsing_data.cc', 'browser/views/clear_browsing_data.h', 'browser/views/constrained_window_impl.cc', @@ -1592,10 +1596,14 @@ 'third_party/wtl/include', ], 'dependencies': [ + 'views', '../google_update/google_update.gyp:google_update', 'installer/util/util.gyp:installer_util', '../printing/printing.gyp:printing', ], + 'export_dependent_settings': [ + 'views', + ], 'sources': [ # Using built-in rule in vstudio for midl. 'browser/history/history_indexer.idl', @@ -1641,6 +1649,7 @@ 'browser/debugger/devtools_view.h', 'browser/debugger/devtools_window_gtk.cc', 'browser/debugger/devtools_window_win.cc', + 'browser/extensions/extension_shelf.cc', 'browser/dock_info.cc', 'browser/dom_ui/html_dialog_contents.cc', 'browser/encoding_menu_controller_delegate.cc', @@ -2293,8 +2302,10 @@ 'browser/tab_contents/test_web_contents.h', 'common/ipc_test_sink.cc', 'common/ipc_test_sink.h', - 'renderer/mock_keyboard.h', 'renderer/mock_keyboard.cc', + 'renderer/mock_keyboard.h', + 'renderer/mock_keyboard_driver_win.cc', + 'renderer/mock_keyboard_driver_win.h', 'renderer/mock_render_process.h', 'renderer/mock_render_thread.cc', 'renderer/mock_render_thread.h', @@ -2624,6 +2635,7 @@ 'browser/debugger/devtools_remote_message_unittest.cc', 'browser/debugger/devtools_remote_listen_socket_unittest.cc', 'browser/debugger/devtools_remote_listen_socket_unittest.h', + 'browser/debugger/devtools_sanity_unittest.cc', 'browser/chrome_thread_unittest.cc', # It is safe to list */cocoa/* files in the "common" file list # without an explicit exclusion since gyp is smart enough to @@ -2858,6 +2870,7 @@ 'browser/bookmarks/bookmark_table_model_unittest.cc', 'browser/browser_commands_unittest.cc', 'browser/browser_unittest.cc', + 'browser/debugger/devtools_sanity_unittest.cc', 'browser/extensions/test_extension_loader.cc', 'browser/importer/firefox_importer_unittest.cc', 'browser/importer/importer_unittest.cc', @@ -3228,6 +3241,8 @@ '../views/widget/accelerator_handler.h', '../views/widget/aero_tooltip_manager.cc', '../views/widget/aero_tooltip_manager.h', + '../views/widget/default_theme_provider.cc', + '../views/widget/default_theme_provider.h', '../views/widget/root_view.cc', '../views/widget/root_view.h', '../views/widget/root_view_drop_target.cc', |