Separate menu & disconnect buttons from the window controls and clean up CSS.

remoting/webapp/html/window_frame.html

Index: remoting/webapp/html/window_frame.html
diff --git a/remoting/webapp/html/window_frame.html b/remoting/webapp/html/window_frame.html
index b19f74fc0d12165f4a5cbe909928b9375d5c7f0a..d841157af7eeb7d3d09a6aeac18b676282ca9111 100644
--- a/remoting/webapp/html/window_frame.html
+++ b/remoting/webapp/html/window_frame.html
@@ -4,51 +4,49 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 <div id="title-bar" class="title-bar apps-v2-only">
-  <span class="window-title">&nbsp;</span>
-  <span class="window-controls-hover-target">
-    <div class="window-controls">
-      <span i18n-title="OPTIONS_MENU"
-            class="window-control window-options menu-button">
-        <span class="menu-button-activator">
-          <img src="icon_options.webp">
-        </span>
-        <ul class="window-options-menu right-align">
-          <li class="menu-send-ctrl-alt-del"
-              i18n-content="SEND_CTRL_ALT_DEL"></li>
-          <li class="menu-send-print-screen"
-              i18n-content="SEND_PRINT_SCREEN"></li>
-          <li class="menu-separator"></li>
-          <li class="menu-resize-to-client"
-              i18n-content="RESIZE_TO_CLIENT"></li>
-          <li class="menu-shrink-to-fit"
-              i18n-content="SHRINK_TO_FIT"></li>
-          <li class="menu-separator"></li>
-          <li class="menu-new-connection"
-              i18n-content="NEW_CONNECTION"></li>
-          <li class="menu-separator"></li>
-          <li class="menu-help"
-              i18n-content="HELP"></li>
-          <li class="menu-feedback"
-              i18n-content="ACTIONBAR_FEEDBACK"></li>
-        </ul>
+  <div class="window-controls-and-title">
+    <span i18n-title="OPTIONS_MENU"
+          class="window-control window-options menu-button">
+      <span class="menu-button-activator">
+        <img src="icon_options.webp">
       </span>
-      <span i18n-title="DISCONNECT_MYSELF_BUTTON"
-            class="window-control window-disconnect">
-        <img src="icon_disconnect.webp">
-      </span>
-      <span i18n-title="MINIMIZE_WINDOW"
-            class="window-control window-minimize">
-        <img src="icon_minimize.webp">
-      </span>
-      <span i18n-title="MAXIMIZE_WINDOW"
-            class="window-control window-maximize-restore">
-        <img src="icon_maximize_restore.webp">
-      </span>
-      <span i18n-title="CLOSE_WINDOW"
-            class="window-control window-close">
-        <img src="icon_close.webp">
-      </span>
-    </div>
-    <div class="window-controls-stub">&nbsp;</div>
-  </span>
-</div>
+      <ul class="window-options-menu right-align">
+        <li class="menu-send-ctrl-alt-del"
+            i18n-content="SEND_CTRL_ALT_DEL"></li>
+        <li class="menu-send-print-screen"
+            i18n-content="SEND_PRINT_SCREEN"></li>
+        <li class="menu-separator"></li>
+        <li class="menu-resize-to-client"
+            i18n-content="RESIZE_TO_CLIENT"></li>
+        <li class="menu-shrink-to-fit"
+            i18n-content="SHRINK_TO_FIT"></li>
+        <li class="menu-separator"></li>
+        <li class="menu-new-connection"
+            i18n-content="NEW_CONNECTION"></li>
+        <li class="menu-separator"></li>
+        <li class="menu-help"
+            i18n-content="HELP"></li>
+        <li class="menu-feedback"
+            i18n-content="ACTIONBAR_FEEDBACK"></li>
+      </ul>
+    </span>
+    <span i18n-title="DISCONNECT_MYSELF_BUTTON"
+          class="window-control window-disconnect">
+      <img src="icon_disconnect.webp">
+    </span>
+    <span class="window-title">&nbsp;</span>
+    <span i18n-title="MINIMIZE_WINDOW"
+          class="window-control window-minimize">
+      <img src="icon_minimize.webp">
+    </span>
+    <span i18n-title="MAXIMIZE_WINDOW"
+          class="window-control window-maximize-restore">
+      <img src="icon_maximize_restore.webp">
+    </span>
+    <span i18n-title="CLOSE_WINDOW"
+          class="window-control window-close">
+      <img src="icon_close.webp">
+    </span>
+  </div>
+  <div class="window-controls-stub">&nbsp;</div>
+</div>  <!-- title-bar -->