| Index: chrome/chrome.gyp
|
| diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
|
| index 60d94f6a3e5342fd4796262b75f5637227f1a08b..8c903872f6768ecbf32582510a1e730a4c2cf382 100644
|
| --- a/chrome/chrome.gyp
|
| +++ b/chrome/chrome.gyp
|
| @@ -367,7 +367,7 @@
|
| # the real inputs/outputs at GYP time isn't possible.
|
| 'variables': {
|
| 'grit_cmd': ['python', '../tools/grit/grit.py'],
|
| - 'frontend_folder': 'browser/debugger/frontend',
|
| + 'frontend_folder': '../content/browser/debugger/frontend',
|
| 'grit_grd_file':
|
| '<(frontend_folder)/devtools_frontend_resources.grd',
|
| },
|
| @@ -418,6 +418,7 @@
|
| ],
|
| },
|
| {
|
| + # TODO(joi): Move debugger-related build rules to content/
|
| 'target_name': 'debugger',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| @@ -437,38 +438,38 @@
|
| '..',
|
| ],
|
| 'sources': [
|
| - 'browser/debugger/browser_list_tabcontents_provider.cc',
|
| - 'browser/debugger/browser_list_tabcontents_provider.h',
|
| - 'browser/debugger/debugger_remote_service.cc',
|
| - 'browser/debugger/debugger_remote_service.h',
|
| - 'browser/debugger/devtools_client_host.cc',
|
| - 'browser/debugger/devtools_client_host.h',
|
| - 'browser/debugger/devtools_file_util.cc',
|
| - 'browser/debugger/devtools_file_util.h',
|
| - 'browser/debugger/devtools_http_protocol_handler.cc',
|
| - 'browser/debugger/devtools_http_protocol_handler.h',
|
| - 'browser/debugger/devtools_manager.cc',
|
| - 'browser/debugger/devtools_manager.h',
|
| - 'browser/debugger/devtools_netlog_observer.cc',
|
| - 'browser/debugger/devtools_netlog_observer.h',
|
| - 'browser/debugger/devtools_protocol_handler.cc',
|
| - 'browser/debugger/devtools_protocol_handler.h',
|
| - 'browser/debugger/devtools_remote.h',
|
| - 'browser/debugger/devtools_remote_listen_socket.cc',
|
| - 'browser/debugger/devtools_remote_listen_socket.h',
|
| - 'browser/debugger/devtools_remote_message.cc',
|
| - 'browser/debugger/devtools_remote_message.h',
|
| - 'browser/debugger/devtools_remote_service.cc',
|
| - 'browser/debugger/devtools_remote_service.h',
|
| - 'browser/debugger/devtools_handler.cc',
|
| - 'browser/debugger/devtools_handler.h',
|
| - 'browser/debugger/devtools_toggle_action.h',
|
| - 'browser/debugger/devtools_window.cc',
|
| - 'browser/debugger/devtools_window.h',
|
| - 'browser/debugger/extension_ports_remote_service.cc',
|
| - 'browser/debugger/extension_ports_remote_service.h',
|
| - 'browser/debugger/inspectable_tab_proxy.cc',
|
| - 'browser/debugger/inspectable_tab_proxy.h',
|
| + '../content/browser/debugger/browser_list_tabcontents_provider.cc',
|
| + '../content/browser/debugger/browser_list_tabcontents_provider.h',
|
| + '../content/browser/debugger/debugger_remote_service.cc',
|
| + '../content/browser/debugger/debugger_remote_service.h',
|
| + '../content/browser/debugger/devtools_client_host.cc',
|
| + '../content/browser/debugger/devtools_client_host.h',
|
| + '../content/browser/debugger/devtools_file_util.cc',
|
| + '../content/browser/debugger/devtools_file_util.h',
|
| + '../content/browser/debugger/devtools_http_protocol_handler.cc',
|
| + '../content/browser/debugger/devtools_http_protocol_handler.h',
|
| + '../content/browser/debugger/devtools_manager.cc',
|
| + '../content/browser/debugger/devtools_manager.h',
|
| + '../content/browser/debugger/devtools_netlog_observer.cc',
|
| + '../content/browser/debugger/devtools_netlog_observer.h',
|
| + '../content/browser/debugger/devtools_protocol_handler.cc',
|
| + '../content/browser/debugger/devtools_protocol_handler.h',
|
| + '../content/browser/debugger/devtools_remote.h',
|
| + '../content/browser/debugger/devtools_remote_listen_socket.cc',
|
| + '../content/browser/debugger/devtools_remote_listen_socket.h',
|
| + '../content/browser/debugger/devtools_remote_message.cc',
|
| + '../content/browser/debugger/devtools_remote_message.h',
|
| + '../content/browser/debugger/devtools_remote_service.cc',
|
| + '../content/browser/debugger/devtools_remote_service.h',
|
| + '../content/browser/debugger/devtools_handler.cc',
|
| + '../content/browser/debugger/devtools_handler.h',
|
| + '../content/browser/debugger/devtools_toggle_action.h',
|
| + '../content/browser/debugger/devtools_window.cc',
|
| + '../content/browser/debugger/devtools_window.h',
|
| + '../content/browser/debugger/extension_ports_remote_service.cc',
|
| + '../content/browser/debugger/extension_ports_remote_service.h',
|
| + '../content/browser/debugger/inspectable_tab_proxy.cc',
|
| + '../content/browser/debugger/inspectable_tab_proxy.h',
|
| ],
|
| 'conditions': [
|
| ['toolkit_uses_gtk == 1', {
|
|
|