Chromium Code Reviews| Index: content/content_browser.gypi |
| diff --git a/content/content_browser.gypi b/content/content_browser.gypi |
| index ac1346f002c505998f2193bc289482d50f7eec56..7b020f980eda1403842b34320db2136bd1449887 100644 |
| --- a/content/content_browser.gypi |
| +++ b/content/content_browser.gypi |
| @@ -233,9 +233,8 @@ |
| 'public/browser/stream_handle.h', |
| 'public/browser/stream_info.cc', |
| 'public/browser/stream_info.h', |
| - 'public/browser/tracing_controller.h', |
| 'public/browser/trace_uploader.h', |
| - 'public_browser/tracing_delegate.h', |
| + 'public/browser/tracing_controller.h', |
| 'public/browser/url_data_source.cc', |
| 'public/browser/url_data_source.h', |
| 'public/browser/user_metrics.h', |
| @@ -260,8 +259,18 @@ |
| 'public/browser/worker_service_observer.h', |
| 'public/browser/zoom_level_delegate.h', |
| 'public/browser/zygote_host_linux.h', |
| + 'public_browser/tracing_delegate.h', |
|
satorux1
2015/02/16 00:36:54
this must be a typo introduced in c563c582a becaus
|
| ], |
| 'private_browser_sources': [ |
| + # These files are generated by GRIT. |
| + '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources.h', |
| + '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.cc', |
| + '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.h', |
| + # These files are generated by devtools_protocol_handler_generator.py. |
| + '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.cc', |
| + '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.h', |
| + '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h', |
| + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc', |
| 'browser/accessibility/accessibility_mode_helper.cc', |
| 'browser/accessibility/accessibility_mode_helper.h', |
| 'browser/accessibility/accessibility_tree_formatter.cc', |
| @@ -1452,15 +1461,6 @@ |
| 'zygote/zygote_linux.cc', |
| 'zygote/zygote_linux.h', |
| 'zygote/zygote_main_linux.cc', |
| - # These files are generated by GRIT. |
| - '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources.h', |
| - '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.cc', |
| - '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.h', |
| - '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h', |
| - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc', |
| - # These files are generated by devtools_protocol_handler_generator.py. |
| - '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.cc', |
| - '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.h', |
| ], |
| 'android_browser_sources': [ |
| 'browser/android/java/gin_java_bound_object.cc', |