chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 3664217125de2b559cb2e6fbfbec50bd6d321930..a30ddaed277d1f8a2fb09ec5140b110616c6af4b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5335,20 +5335,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_SCROLL_PREDICTION_NAME" desc="Title of the flag which enables scroll prediction.">
         Scroll prediction
       </message>
-      <message name="IDS_FLAGS_TOP_CHROME_MD" desc="Title of the flag which enables or disables material design in the top chrome of the browser.">
-        Material Design in the browser's top chrome
+      <message name="IDS_FLAGS_TOP_CHROME_MD" desc="Title of the flag which controls UI layout in the browser's top chrome.">
+        UI Layout for the browser's top chrome
       </message>
       <message name="IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION" desc="Description of the flag which changes the material design elements in the top chrome of the browser.">
-        Sets the material design elements in the browser's top chrome.
+        Toggles between normal and touch (formerly "hybrid") layouts.

[tdanderson, 2016/09/19 18:03:00]

I think we should keep the naming as "hybrid" here. The ultimate goal will be to
either a) completely remove the ability to manually toggle between
normal/hybrid, or b) make the normal/hybrid a permanent user-facing toggle, in
which case it should not live in about:flags.

[Evan Stade, 2016/09/19 19:25:43]

I agree that this probably shouldn't live here forever. Why does that imply we
should keep the name as "hybrid"? If we did make it a user-facing toggle, it
wouldn't be called "hybrid" would it? The main reason to leave it here for now
is that PMs, designers, QA, etc can flip it for testing purposes. Doesn't it
make more sense from their perspective to call this "touch optimized"?

[tdanderson, 2016/09/19 20:09:45]

I thought there was some higher-level plan to use "hybrid" to mean something
more than touch-optimized. Anyway I just spoke with Sebastien and renaming
this is fine by him, I'm good with it too.

       </message>
-      <message name="IDS_FLAGS_TOP_CHROME_MD_MATERIAL" desc="Top Chrome material design option.">
-        Material
-      </message>
-      <message name="IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID" desc="Top Chrome material hybrid design option.">
-        Material Hybrid
+      <message name="IDS_FLAGS_TOP_CHROME_MD_MATERIAL" desc="Top Chrome material design option (default).">
+        Normal
       </message>
-      <message name="IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL" desc="Top Chrome non-material design option.">
-        Non-material
+      <message name="IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID" desc="Top Chrome material hybrid design option (for touchscreens).">
+        Touch
       </message>
       <message name="IDS_FLAGS_SECONDARY_UI_MD" desc="Title of the flag which enables or disables material design in the rest of the native UI of the browser (beyond top chrome).">
         Material Design in the rest of the browser's native UI