Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'chromecast_branding%': 'Chromium', | 8 'chromecast_branding%': 'Chromium', |
| 9 }, | 9 }, |
| 10 'target_defaults': { | 10 'target_defaults': { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 'net/network_change_notifier_cast.cc', | 95 'net/network_change_notifier_cast.cc', |
| 96 'net/network_change_notifier_cast.h', | 96 'net/network_change_notifier_cast.h', |
| 97 'net/network_change_notifier_factory_cast.cc', | 97 'net/network_change_notifier_factory_cast.cc', |
| 98 'net/network_change_notifier_factory_cast.h', | 98 'net/network_change_notifier_factory_cast.h', |
| 99 ], | 99 ], |
| 100 }, | 100 }, |
| 101 { | 101 { |
| 102 'target_name': 'cast_service', | 102 'target_name': 'cast_service', |
| 103 'type': '<(component)', | 103 'type': '<(component)', |
| 104 'dependencies': [ | 104 'dependencies': [ |
| 105 'cast_common', | |
| 105 '../skia/skia.gyp:skia', | 106 '../skia/skia.gyp:skia', |
| 106 ], | 107 ], |
| 107 'sources': [ | 108 'sources': [ |
| 109 'service/cast_network_delegate.cc', | |
| 110 'service/cast_network_delegate.h', | |
|
lcwu1
2014/09/25 18:53:18
I think it makes more sense for the network delega
gunsch
2014/09/25 19:24:59
I disagree. See my internal CL. ChromecastService
lcwu1
2014/09/25 20:07:04
ChromecastService should not depend on CastNetwork
gunsch
2014/09/25 20:46:34
Done.
| |
| 108 'service/cast_service.cc', | 111 'service/cast_service.cc', |
| 109 'service/cast_service.h', | 112 'service/cast_service.h', |
| 110 ], | 113 ], |
| 111 'conditions': [ | 114 'conditions': [ |
| 112 ['chromecast_branding=="Chrome"', { | 115 ['chromecast_branding=="Chrome"', { |
| 113 'dependencies': [ | 116 'dependencies': [ |
| 114 'internal/chromecast_internal.gyp:cast_service_internal', | 117 'internal/chromecast_internal.gyp:cast_service_internal', |
| 115 ], | 118 ], |
| 116 }, { | 119 }, { |
| 117 'dependencies': [ | 120 'dependencies': [ |
| 118 '../base/base.gyp:base', | 121 '../base/base.gyp:base', |
| 119 '../content/content.gyp:content', | 122 '../content/content.gyp:content', |
| 120 ], | 123 ], |
| 124 'sources': [ | |
| 125 'service/cast_network_delegate_simple.cc', | |
| 126 ], | |
| 121 'conditions': [ | 127 'conditions': [ |
| 122 ['OS=="android"', { | 128 ['OS=="android"', { |
| 123 'sources': [ | 129 'sources': [ |
| 124 'service/cast_service_android.cc', | 130 'service/cast_service_android.cc', |
| 125 'service/cast_service_android.h', | 131 'service/cast_service_android.h', |
| 126 ], | 132 ], |
| 127 }, { | 133 }, { |
| 128 'sources': [ | 134 'sources': [ |
| 129 'service/cast_service_simple.cc', | 135 'service/cast_service_simple.cc', |
| 130 'service/cast_service_simple.h', | 136 'service/cast_service_simple.h', |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 464 'sources': [ | 470 'sources': [ |
| 465 'shell/browser/test/chromecast_browser_test.cc', | 471 'shell/browser/test/chromecast_browser_test.cc', |
| 466 'shell/browser/test/chromecast_browser_test.h', | 472 'shell/browser/test/chromecast_browser_test.h', |
| 467 'shell/browser/test/chromecast_browser_test_runner.cc', | 473 'shell/browser/test/chromecast_browser_test_runner.cc', |
| 468 ], | 474 ], |
| 469 }, | 475 }, |
| 470 ], # end of targets | 476 ], # end of targets |
| 471 }], | 477 }], |
| 472 ], # end of conditions | 478 ], # end of conditions |
| 473 } | 479 } |
| OLD | NEW |