[Chromecast] Change chromecast_branding to public

chromecast/chromecast.gyp

Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 778decdf64bca7c5a120e4a3fc7845555170e910..685acd059fefbbd21952e2539a8ec1d0e816da9f 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%': 'Chromium',
+    'chromecast_branding%': 'public',
     '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=="Chrome" and use_chromecast_webui==1', {
+              ['chromecast_branding_as_chrome==1 and use_chromecast_webui==1', {

[byungchul, 2015/07/28 23:43:34]

why not chromecast_branding!='public' as lcwu suggested?

[yucliu1, 2015/07/29 00:01:59]

It's maybe easier to change the code if we change the branding policy. I'm also
OK with lcwu's sugg.

[gunsch, 2015/07/29 00:22:15]

Where does chromecast_branding_as_chrome come from?

[yucliu1, 2015/07/29 00:23:56]

At the end of this file. There's a big "conditions" block.

[gunsch, 2015/07/29 00:31:04]

Ah I see.

I would second preferring "chromecast_branding != 'public'". It's not very
idiomatic to have GYP variables depend on one another like this.

                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pak',
@@ -235,7 +235,7 @@
         },
       ],
       'conditions': [
-        ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
+        ['chromecast_branding_as_chrome==1 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=="Chrome"', {
+        ['chromecast_branding_as_chrome==1', {
           'dependencies': [
             'internal/chromecast_internal.gyp:cast_shell_internal',
           ],
@@ -421,7 +421,7 @@
             'cast_jni_headers',
           ],
         }],
-        ['chromecast_branding!="Chrome" and OS!="android"', {
+        ['chromecast_branding_as_chrome!=1 and OS!="android"', {
           'sources': [
             'base/cast_sys_info_util_simple.cc',
           ],
@@ -516,7 +516,7 @@
             'app/android/cast_jni_loader.cc',
           ],
           'conditions': [
-            ['chromecast_branding=="Chrome"', {
+            ['chromecast_branding_as_chrome==1', {
               'dependencies': [
                 'internal/chromecast_internal.gyp:cast_shell_android_internal'
               ],
@@ -715,5 +715,15 @@
         }
       ]
     }],
+    ['chromecast_branding=="google" or chromecast_branding=="internal"', {
+      'variables': {
+        'chromecast_branding_as_chrome': 1,
+      },
+    }, {
+      'variables': {
+        'chromecast_branding_as_chrome': 0,
+      },
+    },
+    ],
   ],  # end of conditions
 }