diff options
author | estade <estade@chromium.org> | 2015-08-18 13:17:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 20:18:02 +0000 |
commit | 658c87e4f1daf0bc0f766189daf8ca9cceae737c (patch) | |
tree | 0a1406027f54fca777542bd6bf705f2123df6228 | |
parent | 6e33976aaa05c8da8f7950ee71e3e445f3668b36 (diff) | |
download | chromium_src-658c87e4f1daf0bc0f766189daf8ca9cceae737c.zip chromium_src-658c87e4f1daf0bc0f766189daf8ca9cceae737c.tar.gz chromium_src-658c87e4f1daf0bc0f766189daf8ca9cceae737c.tar.bz2 |
Webui resources cleanup
delete unused assets
- imageburner is dead (chrome://imageburner just redirects and will be removed later this year)
- toggle buttons were removed from the network list at some point but some JS and CSS lived on
- other assets are just plain unused
BUG=522168
Review URL: https://codereview.chromium.org/1289753010
Cr-Commit-Position: refs/heads/master@{#344011}
-rw-r--r-- | chrome/browser/resources/chromeos/image_burner.css | 224 | ||||
-rw-r--r-- | chrome/browser/resources/options/browser_options.css | 18 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/network_list.js | 14 | ||||
-rw-r--r-- | ui/webui/resources/images/2x/help.png | bin | 431 -> 0 bytes | |||
-rw-r--r-- | ui/webui/resources/images/icon_checkmark.png | bin | 322 -> 0 bytes | |||
-rw-r--r-- | ui/webui/resources/images/icon_warning.png | bin | 712 -> 0 bytes | |||
-rw-r--r-- | ui/webui/resources/images/question_mark.png | bin | 216 -> 0 bytes | |||
-rw-r--r-- | ui/webui/resources/webui_resources.grd | 2 |
8 files changed, 2 insertions, 256 deletions
diff --git a/chrome/browser/resources/chromeos/image_burner.css b/chrome/browser/resources/chromeos/image_burner.css deleted file mode 100644 index 50e7327..0000000 --- a/chrome/browser/resources/chromeos/image_burner.css +++ /dev/null @@ -1,224 +0,0 @@ -/* 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. */ - -html, -body, -ul, -li { - margin: 0; - padding: 0; -} - -body, -html { - height: 100%; -} - -a { - color: rgb(0, 102, 204); - text-decoration: none; -} - -button { - -webkit-margin-start: 15px; - min-width: 80px; -} - -h1 { - font-size: 15pt; - margin-top: 0; -} - -h2 { - font-size: 13pt; - margin-top: 0; -} - -header { - -webkit-padding-start: 120px; - background-color: rgb(242, 247, 250); - border-bottom: 1px solid rgb(218, 236, 248); - padding-bottom: 50px; - padding-top: 50px; -} - -header p { - margin-bottom: 0; - width: 800px; -} - -input { - margin-bottom: 7px; - margin-top: 7px; -} - -li { - list-style: none; - margin-bottom: 8px; -} - -p { - margin-top: 0; -} - -progress { - margin-bottom: 0; - width: 371px; -} - -ul { - margin-bottom: 25px; - margin-top: 0; -} - -.aligned-to-start { - -webkit-padding-start: 120px; -} - -.float-start { - float: left; -} - -html[dir='rtl'] .float-start { - float-right; -} - -.float-stop { - clear: both; -} - -.default-text { - margin-bottom: 0; -} - -.normal-text { - font-size: 15; -} - -.progress-text { - color: #666; - margin-bottom: 2px; - margin-top: 2px; -} - -.select-option { - margin-top: 3px; -} - -.new-line { - clear: both; -} - -#main-content { - -webkit-padding-start: 120px; - background-image: -webkit-linear-gradient(rgb(255, 255, 255), - rgb(239, 245, 255)); - bottom: 0; - left: 0; - padding-bottom: 35px; - padding-top: 35px; - position: absolute; - right: 0; - top: 195px; -} - -#status-icon { - display: none; - height: 64px; - left: 32px; - position: absolute; - right: 37px; - width: 64px; -} - -#main-content.device-detected-none #status-icon { - background: url(insert.png); - background-repeat: no-repeat; - display: block; -} - -#main-content.device-detected-usb #status-icon { - background: url(detected_usb.png); - background-repeat: no-repeat; - display: block; -} - -#main-content.device-detected-sd #status-icon { - background: url(detected_sd.png); - background-repeat: no-repeat; - display: block; -} - -#progress-status-div { - display: none; -} - -#main-content.progress #progress-status-div { - display: block; -} - -#cancel-button { - display: none; - margin-bottom: 0; - margin-top: -4px; -} - -#main-content.progress-canceble #cancel-button { - display: block; -} - -#pending-time { - clear: both -} - -#device-selection { - display: none; -} - -#main-content.device-detected-mul #device-selection { - display: block; -} - -#warning-icon { - -webkit-margin-end: 10px; - display: none; - height: 26px; - width: 25px; -} - -#main-content.warning #warning-icon, -#main-content.error #warning-icon { - background: url(../../../../ui/webui/resources/images/icon_warning.png); - background-repeat: no-repeat; - display: block; -} - -#main-content.success #warning-icon { - background: url(../../../../ui/webui/resources/images/icon_checkmark.png); - background-repeat: no-repeat; - display: block; -} - -#warning-div { - display: block; -} - -#main-content.progress #warning-div { - display: none; -} - -#warning-text { - max-width: 550px; - padding-top: 4px; -} - -#main-content.success #warning-button, -#main-content.warning-no-conf #warning-button, -#main-content.device-detected-none #warning-button { - display: none; -} - -#main-content.error #warning-button { - clear: both; -} diff --git a/chrome/browser/resources/options/browser_options.css b/chrome/browser/resources/options/browser_options.css index 6870b3a..0b10188 100644 --- a/chrome/browser/resources/options/browser_options.css +++ b/chrome/browser/resources/options/browser_options.css @@ -281,24 +281,10 @@ list:not([disabled]) > .network-group[selected] { } } -.network-add-connection, -.network-control-active, -.network-control-inactive { - background-position: center center !important; - background-repeat: no-repeat; -} - .network-add-connection { background-image: url(chrome://theme/IDR_NETWORK_ADD_CONNECTION); - background-size: 16px; -} - -.network-control-inactive { - background-image: none; -} - -.network-control-active { - background-image: url(chrome://theme/IDR_PROFILE_SELECTED); + background-position: center center !important; + background-repeat: no-repeat; background-size: 16px; } diff --git a/chrome/browser/resources/options/chromeos/network_list.js b/chrome/browser/resources/options/chromeos/network_list.js index 018f67a..eb25cf4 100644 --- a/chrome/browser/resources/options/chromeos/network_list.js +++ b/chrome/browser/resources/options/chromeos/network_list.js @@ -1105,20 +1105,6 @@ cr.define('options.network', function() { }, /** - * Updates the state of a toggle button. - * @param {string} key Unique identifier for the element. - * @param {boolean} active Whether the control is active. - */ - updateToggleControl: function(key, active) { - var index = this.indexOf(key); - if (index != undefined) { - var entry = this.dataModel.item(index); - entry.iconType = active ? 'control-active' : 'control-inactive'; - this.update(entry); - } - }, - - /** * Updates the state of network devices and services. * @param {!Array<{State: string, Type: string}>} deviceStates The result * from networkingPrivate.getDeviceStates. diff --git a/ui/webui/resources/images/2x/help.png b/ui/webui/resources/images/2x/help.png Binary files differdeleted file mode 100644 index 8f6e58f..0000000 --- a/ui/webui/resources/images/2x/help.png +++ /dev/null diff --git a/ui/webui/resources/images/icon_checkmark.png b/ui/webui/resources/images/icon_checkmark.png Binary files differdeleted file mode 100644 index 327add2..0000000 --- a/ui/webui/resources/images/icon_checkmark.png +++ /dev/null diff --git a/ui/webui/resources/images/icon_warning.png b/ui/webui/resources/images/icon_warning.png Binary files differdeleted file mode 100644 index 8253099..0000000 --- a/ui/webui/resources/images/icon_warning.png +++ /dev/null diff --git a/ui/webui/resources/images/question_mark.png b/ui/webui/resources/images/question_mark.png Binary files differdeleted file mode 100644 index 7038584..0000000 --- a/ui/webui/resources/images/question_mark.png +++ /dev/null diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd index 1919564..8464c5e 100644 --- a/ui/webui/resources/webui_resources.grd +++ b/ui/webui/resources/webui_resources.grd @@ -187,8 +187,6 @@ without changes to the corresponding grd file. --> file="images/error.svg" type="BINDATA" /> <include name="IDR_WEBUI_IMAGES_GEAR" file="images/gear.png" type="BINDATA" /> - <include name="IDR_WEBUI_IMAGES_QUESTION_MARK" - file="images/question_mark.png" type="BINDATA" /> <include name="IDR_WEBUI_IMAGES_SELECT" file="images/select.png" type="BINDATA" /> <include name="IDR_WEBUI_IMAGES_THROBBER" |