Index: content/content_common.gypi |
diff --git a/content/content_common.gypi b/content/content_common.gypi |
index fbf356a6a19759e7e65449de78ddeb074de47d37..ded7accea6203e288584709a692ec23c6fd4bded 100644 |
--- a/content/content_common.gypi |
+++ b/content/content_common.gypi |
@@ -39,6 +39,8 @@ |
'public_common_sources': [ |
'public/common/appcache_info.h', |
'public/common/bindings_policy.h', |
+ 'public/common/browser_plugin_guest_mode.cc', |
+ 'public/common/browser_plugin_guest_mode.h', |
'public/common/child_process_host.h', |
'public/common/child_process_host_delegate.cc', |
'public/common/child_process_host_delegate.h', |
@@ -359,6 +361,9 @@ |
'common/host_discardable_shared_memory_manager.h', |
'common/host_shared_bitmap_manager.cc', |
'common/host_shared_bitmap_manager.h', |
+ 'common/image_messages.h', |
Charlie Reis
2015/07/21 16:58:24
Merge conflict?
ncarter (slow)
2015/07/22 23:29:08
Very good catch. Done.
|
+ 'common/in_process_child_thread_params.cc', |
+ 'common/in_process_child_thread_params.h', |
'common/indexed_db/indexed_db_constants.h', |
'common/indexed_db/indexed_db_key.cc', |
'common/indexed_db/indexed_db_key.h', |
@@ -406,8 +411,6 @@ |
'common/input_messages.h', |
'common/inter_process_time_ticks_converter.cc', |
'common/inter_process_time_ticks_converter.h', |
- 'common/in_process_child_thread_params.cc', |
- 'common/in_process_child_thread_params.h', |
'common/mac/attributed_string_coder.h', |
'common/mac/attributed_string_coder.mm', |
'common/mac/font_descriptor.h', |
@@ -453,8 +456,8 @@ |
'common/net/url_request_user_data.h', |
'common/one_writer_seqlock.cc', |
'common/one_writer_seqlock.h', |
- 'common/p2p_messages.h', |
'common/origin_util.cc', |
+ 'common/p2p_messages.h', |
'common/page_state_serialization.cc', |
'common/page_state_serialization.h', |
'common/page_zoom.cc', |
@@ -530,6 +533,8 @@ |
'common/set_process_title.h', |
'common/set_process_title_linux.cc', |
'common/set_process_title_linux.h', |
+ 'common/site_isolation_policy.cc', |
+ 'common/site_isolation_policy.h', |
'common/speech_recognition_messages.h', |
'common/ssl_status_serialization.cc', |
'common/ssl_status_serialization.h', |