[Media Router] Update Media Router flags post-launch.

chrome/app/media_router_strings.grdp

Index: chrome/app/media_router_strings.grdp
diff --git a/chrome/app/media_router_strings.grdp b/chrome/app/media_router_strings.grdp
index b73f8c99f9d446dd29afa9992595b57270109cfd..0ae4ec88be95b7a92226c08440f549eef2cb6ae3 100644
--- a/chrome/app/media_router_strings.grdp
+++ b/chrome/app/media_router_strings.grdp
@@ -58,11 +58,9 @@
   <message name="IDS_MEDIA_ROUTER_ABOUT" desc="Title of a menu item which, on click, opens a page with product information about Chromecast.">
    About
   </message>
-  <if expr="_google_chrome">
-    <message name="IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE" desc="Title of a menu item which, on click, toggles the preference to opt in or out of cloud services.">
-     Enable cloud services
-    </message>
-  </if>
+  <message name="IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE" desc="Title of a menu item which, on click, toggles the preference to opt in or out of cloud services.">
+    Enable cloud services
+  </message>
   <message name="IDS_MEDIA_ROUTER_HELP" desc="Title of a menu item which, on click, opens a page to the Chromecast help center.">
    Help
   </message>
@@ -77,10 +75,10 @@
   </message>
 
   <!-- First Run Flow -->
-  <if expr="_google_chrome">
-    <message name="IDS_MEDIA_ROUTER_FIRST_RUN_FLOW_CLOUD_PREF_TEXT" desc="Text of the cloud services preferences text in the first run flow, which is shown to the user if they are currently signed in and have enabled sync.">
+  <message name="IDS_MEDIA_ROUTER_FIRST_RUN_FLOW_CLOUD_PREF_TEXT" desc="Text of the cloud services preferences text in the first run flow, which is shown to the user if they are currently signed in and have enabled sync.">
       Enable casting to cloud-based services like Google Hangouts.

[apacible, 2016/10/25 22:01:28]

nit: indentation.

[apacible, 2016/10/25 22:01:28]

nit: In Chromium, do we still want to mention "Google" specifically?

[mark a. foltz, 2016/10/25 22:56:36]

Done.

Re: Google Hangouts

Hangouts is a Google product so I think we should keep it as-is...

[apacible, 2016/10/26 15:39:14]

We typically want to avoid mentioning anything "Google" branded for Chromium.
Can you check with skonig for guidance? I'm not sure how strict we should be in
this case.

-    </message>
+  </message>
+  <if expr="_google_chrome">
     <message name="IDS_MEDIA_ROUTER_FIRST_RUN_FLOW_TITLE" desc="Title of the first run flow, which is shown to the user the first time they use Media Router, until they acknowledge the message. This is a welcome message that introduces Media Router to the user.">
       Welcome to the Cast experience in Chrome!
     </message>