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

Unified Diff: chromecast/chromecast.gyp

Issue 1266723002: Revert of [Chromecast] Change chromecast_branding to public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « chromecast/chromecast.gni ('k') | chromecast/chromecast_locales.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 1b0f65d35f052b61e43811f2dd07463a4ee94c10..778decdf64bca7c5a120e4a3fc7845555170e910 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -11,7 +11,7 @@
# Refers to enum CastProductType in components/metrics/proto/cast_logs.proto
'cast_product_type%': 0, # CAST_PRODUCT_TYPE_UNKNOWN
'chromium_code': 1,
- 'chromecast_branding%': 'public',
+ 'chromecast_branding%': 'Chromium',
'disable_display%': 0,
'enable_default_cast_graphics%': 1,
'ozone_platform_cast%': 0,
@@ -222,7 +222,7 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
],
'conditions': [
- ['chromecast_branding!="public" and use_chromecast_webui==1', {
+ ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pak',
@@ -235,7 +235,7 @@
},
],
'conditions': [
- ['chromecast_branding!="public" and use_chromecast_webui==1', {
+ ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
'dependencies': [
'internal/chromecast_resources.gyp:chromecast_app_resources',
'internal/chromecast_resources.gyp:chromecast_webui_resources',
@@ -353,7 +353,7 @@
'renderer/media/capabilities_message_filter.h',
],
'conditions': [
- ['chromecast_branding!="public"', {
+ ['chromecast_branding=="Chrome"', {
'dependencies': [
'internal/chromecast_internal.gyp:cast_shell_internal',
],
@@ -421,7 +421,7 @@
'cast_jni_headers',
],
}],
- ['chromecast_branding=="public" and OS!="android"', {
+ ['chromecast_branding!="Chrome" and OS!="android"', {
'sources': [
'base/cast_sys_info_util_simple.cc',
],
@@ -516,7 +516,7 @@
'app/android/cast_jni_loader.cc',
],
'conditions': [
- ['chromecast_branding!="public"', {
+ ['chromecast_branding=="Chrome"', {
'dependencies': [
'internal/chromecast_internal.gyp:cast_shell_android_internal'
],
« no previous file with comments | « chromecast/chromecast.gni ('k') | chromecast/chromecast_locales.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698