Relanding - https://codereview.chromium.org/20565006/

The CL was reverted due to this error,
c:\b\build\slave\google-chrome-rel-win\build\src\chrome/browser/feedback/feedback_util.h(13): fatal error C1083: Cannot open include file: 'chrome/browser/feedback/proto/common.pb.h': No such file or directory

This CL neither changes line 13 in feedback_util.h (which includes the generated protobuf file), nor does it change common.proto, which is used to generate common.ph.h; so it seems very probable that this build error is a flake.

TBR=rkc@chromium.org
BUG=None.

Review URL: https://codereview.chromium.org/22253004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215683 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 240 insertions, 0 deletions

diff --git a/ui/webui/resources/css/apps/common.css b/ui/webui/resources/css/apps/common.css
new file mode 100644
index 0000000..31b510d
--- /dev/null
+++ b/ui/webui/resources/css/apps/common.css
@@ -0,0 +1,103 @@
+/* Copyright 2013 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file. */
+
+button.white-button,
+button.blue-button {
+  border: 5px solid transparent;
+  box-sizing: content-box;
+  cursor: default;
+  height: 21px;
+  line-height: 21px;
+  margin: 0;
+  min-height: 21px;
+  min-width: 55px;
+  padding: 0 10px;
+  position: relative;
+  outline: none;
+  text-align: center;
+  z-index: 1;
+}
+
+button.white-button {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/button.png') 1x,
+    url('chrome://resources/images/2x/apps/button.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.white-button:hover {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/button_hover.png') 1x,
+    url('chrome://resources/images/2x/apps/button_hover.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.white-button:active {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/button_pressed.png') 1x,
+    url('chrome://resources/images/2x/apps/button_pressed.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.white-button[disabled] {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/button_inactive.png') 1x,
+    url('chrome://resources/images/2x/apps/button_inactive.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.blue-button {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/blue_button.png') 1x,
+    url('chrome://resources/images/2x/apps/_bluebutton.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.blue-button:hover {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/blue_button_hover.png') 1x,
+    url('chrome://resources/images/2x/apps/blue_button_hover.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.blue-button:active {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/blue_button_pressed.png') 1x,
+    url('chrome://resources/images/2x/apps/blue_button_pressed.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+button.blue-button[disabled] {
+  border-image: -webkit-image-set(
+    url('chrome://resources/images/apps/blue_button_inactive.png') 1x,
+    url('chrome://resources/images/2x/apps/blue_button_inactive.png')
+        2x) 5 fill / 5px / 2px repeat;
+}
+
+input[type='checkbox'] {
+  -webkit-appearance: none;
+  border: none;
+  outline: none;
+}
+
+input[type='checkbox']::after {
+  content: '';
+  display: block;
+  height: 16px;
+  left: -2px;
+  top: -2px;
+  width: 16px;
+}
+
+input[type='checkbox']:not(:checked)::after {
+  background-image: -webkit-image-set(
+    url('chrome://resources/images/apps/checkbox.png') 1x,
+    url('chrome://resources/images/2x/apps/checkbox.png') 2x);
+}
+
+input[type='checkbox']:checked::after {
+  background-image: -webkit-image-set(
+    url('chrome://resources/images/apps/checkbox_checked.png') 1x,
+    url('chrome://resources/images/2x/apps/checkbox_checked.png') 2x);
+}
diff --git a/ui/webui/resources/css/apps/topbutton_bar.css b/ui/webui/resources/css/apps/topbutton_bar.css
new file mode 100644
index 0000000..aa91875
--- /dev/null
+++ b/ui/webui/resources/css/apps/topbutton_bar.css
@@ -0,0 +1,60 @@
+/* Copyright 2013 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file. */
+
+.topbutton-bar {
+  -webkit-box-align: center;
+  display: -webkit-box;
+}
+
+.topbutton-bar button {
+  -webkit-app-region: no-drag;
+  -webkit-box-shadow: none;
+  -webkit-margin-end: 10px;
+  background-color: transparent;
+  background-image: none;
+  background-position: center;
+  background-repeat: no-repeat;
+  border: 0;
+  display: block;
+  height: 32px;
+  outline: none;
+  padding: 0;
+  width: 32px;
+}
+
+.topbutton-bar button:active {
+  -webkit-box-shadow:
+    0 1px 0 0 #c2c2c2 inset,
+    0 0 0 1px #dedede inset;
+}
+
+.topbutton-bar button:hover,
+.topbutton-bar button:focus,
+.topbutton-bar button:active {
+  background-color: #ededed;
+}
+
+.topbutton-bar .maximize-button {
+  background-image: -webkit-image-set(
+      url('chrome://resources/images/apps/topbar_button_maximize.png') 1x,
+      url('chrome://resources/images/2x/apps/topbar_button_maximize.png') 2x);
+}
+
+.topbutton-bar .minimize-button {
+  background-image: -webkit-image-set(
+      url('chrome://resources/images/apps/topbar_button_minimize.png') 1x,
+      url('chrome://resources/images/2x/apps/topbar_button_minimize.png') 2x);
+}
+
+.topbutton-bar .close-button {
+  background-image: -webkit-image-set(
+      url('chrome://resources/images/apps/topbar_button_close.png') 1x,
+      url('chrome://resources/images/2x/apps/topbar_button_close.png') 2x);
+}
+
+.topbutton-bar .gear-button {
+  background-image: -webkit-image-set(
+      url('chrome://resources/images/apps/topbar_button_settings.png') 1x,
+      url('chrome://resources/images/2x/apps/topbar_button_settings.png') 2x);
+}
diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd
index 219ebbf..52e6216 100644
--- a/ui/webui/resources/webui_resources.grd
+++ b/ui/webui/resources/webui_resources.grd
@@ -17,6 +17,79 @@ without changes to the corresponding grd file. -->
       <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" type="BINDATA" />
       <include name="IDR_WEBUI_I18N_TEMPLATE2_JS" file="js/i18n_template2.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" flattenhtml="true" type="BINDATA" />
+
+      <!-- Component apps common image resources - 1x -->
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON"
+               file="../../resources/default_100_percent/common/button.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_PRESSED"
+               file="../../resources/default_100_percent/common/button_pressed.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_HOVER"
+               file="../../resources/default_100_percent/common/button_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_DISABLED"
+               file="../../resources/default_100_percent/common/button_inactive.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON"
+               file="../../resources/default_100_percent/common/blue_button.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON_PRESSED"
+               file="../../resources/default_100_percent/common/blue_button_pressed.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON_HOVER"
+               file="../../resources/default_100_percent/common/blue_button_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON_DISABLED"
+               file="../../resources/default_100_percent/common/blue_button_inactive.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_CLOSE"
+               file="images/apps/topbar_button_close.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_MAXIMIZE"
+               file="images/apps/topbar_button_maximize.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_MINIMIZE"
+               file="images/apps/topbar_button_minimize.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_SETTINGS"
+               file="images/apps/topbar_button_settings.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX"
+               file="../../resources/default_100_percent/common/checkbox.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_HOVER"
+               file="../../resources/default_100_percent/common/checkbox_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_PRESSED"
+               file="../../resources/default_100_percent/common/checkbox_pressed.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_CHECKED"
+               file="../../resources/default_100_percent/common/checkbox_checked.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_CHECKED_HOVER"
+               file="../../resources/default_100_percent/common/checkbox_checked_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_CHECKED_PRESSED"
+               file="../../resources/default_100_percent/common/checkbox_checked_pressed.png" type="BINDATA" />
+
+      <!-- Component apps common image resources - 2x -->
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_2X"
+               file="../../resources/default_200_percent/common/button.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_PRESSED_2X"
+               file="../../resources/default_200_percent/common/button_pressed.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_HOVER_2X"
+               file="../../resources/default_200_percent/common/button_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON_2X"
+               file="../../resources/default_200_percent/common/blue_button.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON_PRESSED_2X"
+               file="../../resources/default_200_percent/common/blue_button_pressed.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_BLUE_BUTTON_HOVER_2X_2X"
+               file="../../resources/default_200_percent/common/blue_button_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_CLOSE_2X"
+               file="images/2x/apps/topbar_button_close.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_MAXIMIZE_2X"
+               file="images/2x/apps/topbar_button_maximize.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_MINIMIZE_2X"
+               file="images/2x/apps/topbar_button_minimize.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_TOPBAR_BUTTON_SETTINGS_2X"
+               file="images/2x/apps/topbar_button_settings.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_2X"
+               file="../../resources/default_200_percent/common/checkbox.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_HOVER_2X"
+               file="../../resources/default_200_percent/common/checkbox_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_PRESSED_2X"
+               file="../../resources/default_200_percent/common/checkbox_pressed.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_CHECKED_2X"
+               file="../../resources/default_200_percent/common/checkbox_checked.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_CHECKED_HOVER_2X"
+               file="../../resources/default_200_percent/common/checkbox_checked_hover.png" type="BINDATA" />
+      <include name="IDR_WEBUI_IMAGES_APPS_CHECKBOX_CHECKED_PRESSED_2X"
+               file="../../resources/default_200_percent/common/checkbox_checked_pressed.png" type="BINDATA" />
+
       <include name="IDR_WEBUI_IMAGES_CHECK"
                file="images/check.png" type="BINDATA" />
       <include name="IDR_WEBUI_IMAGES_CHECKBOX_BLACK"
@@ -51,6 +124,10 @@ without changes to the corresponding grd file. -->
                  file="css/bubble_button.css" type="chrome_html" />
       <structure name="IDR_WEBUI_CSS_BUTTER_BAR"
                  file="css/butter_bar.css" type="chrome_html" />
+      <structure name="IDR_WEBUI_CSS_APPS_COMMON"
+                 file="css/apps/common.css" type="chrome_html" />
+      <structure name="IDR_WEBUI_CSS_APPS_TOPBUTTON_BAR"
+                 file="css/apps/topbutton_bar.css" type="chrome_html" />
       <structure name="IDR_WEBUI_CSS_DIALOGS"
                  file="css/dialogs.css" type="chrome_html" />
       <structure name="IDR_WEBUI_CSS_LIST"