Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chromeos/chromeos.gyp

Issue 139053003: Chrome OS: avoid suspending on lid close when casting is active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments and add unit test. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 14ef3f9c5897bdb1df51afd5f6bd6180cc04581a..6aaefa250c2ccbd44899046b445133d0c1f10f7a 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -249,8 +249,8 @@
'network/managed_network_configuration_handler_impl.h',
'network/managed_state.cc',
'network/managed_state.h',
- 'network/network_activation_handler.cc',
- 'network/network_activation_handler.h',
+ 'network/network_activation_handler.cc',
+ 'network/network_activation_handler.h',
'network/network_cert_migrator.cc',
'network/network_cert_migrator.h',
'network/network_change_notifier_chromeos.cc',
@@ -368,6 +368,9 @@
],
}],
],
+ 'include_dirs': [
+ '../skia/config',
+ ],
},
{
# This target contains mocks that can be used to write unit tests.
@@ -522,9 +525,11 @@
'process_proxy/process_output_watcher_unittest.cc',
'process_proxy/process_proxy_unittest.cc',
'system/name_value_pairs_parser_unittest.cc',
+ '../content/public/common/media_stream_request.cc',
],
'include_dirs': [
'..',
+ '../skia/config',
],
'conditions': [
[ 'linux_use_tcmalloc==1', {
« chromeos/DEPS ('K') | « chromeos/DEPS ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698