summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/print_preview
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/resources/print_preview')
-rw-r--r--chrome/browser/resources/print_preview/data/destination.js11
-rw-r--r--chrome/browser/resources/print_preview/images/classic_printer_32.pngbin971 -> 0 bytes
-rw-r--r--chrome/browser/resources/print_preview/images/cloud_printer_32.pngbin905 -> 0 bytes
-rw-r--r--chrome/browser/resources/print_preview/images/cloud_printer_shared_32.pngbin1027 -> 0 bytes
-rw-r--r--chrome/browser/resources/print_preview/images/mobile_shared_32.pngbin573 -> 0 bytes
-rw-r--r--chrome/browser/resources/print_preview/search/destination_list_item.css2
-rw-r--r--chrome/browser/resources/print_preview/settings/destination_settings.css2
7 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/resources/print_preview/data/destination.js b/chrome/browser/resources/print_preview/data/destination.js
index bffc30c..769fb74 100644
--- a/chrome/browser/resources/print_preview/data/destination.js
+++ b/chrome/browser/resources/print_preview/data/destination.js
@@ -149,11 +149,10 @@ cr.define('print_preview', function() {
* @private
*/
Destination.IconUrl_ = {
- CLOUD: 'images/cloud_printer_32.png',
- CLOUD_SHARED: 'images/cloud_printer_shared_32.png',
- LOCAL: 'images/classic_printer_32.png',
+ CLOUD: 'images/printer.png',
+ CLOUD_SHARED: 'images/printer_shared.png',
+ LOCAL: 'images/printer.png',
MOBILE: 'images/mobile_32.png',
- MOBILE_SHARED: 'images/mobile_shared_32.png',
GOOGLE_PROMOTED: 'images/google_promoted_printer_32.png'
};
@@ -278,8 +277,10 @@ cr.define('print_preview', function() {
return Destination.IconUrl_.LOCAL;
} else if (this.type_ == Destination.Type.MOBILE) {
return Destination.IconUrl_.MOBILE;
- } else {
+ } else if (this.isOwned_) {
return Destination.IconUrl_.CLOUD;
+ } else {
+ return Destination.IconUrl_.CLOUD_SHARED;
}
},
diff --git a/chrome/browser/resources/print_preview/images/classic_printer_32.png b/chrome/browser/resources/print_preview/images/classic_printer_32.png
deleted file mode 100644
index b31b5bb..0000000
--- a/chrome/browser/resources/print_preview/images/classic_printer_32.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/print_preview/images/cloud_printer_32.png b/chrome/browser/resources/print_preview/images/cloud_printer_32.png
deleted file mode 100644
index 1cb377d..0000000
--- a/chrome/browser/resources/print_preview/images/cloud_printer_32.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/print_preview/images/cloud_printer_shared_32.png b/chrome/browser/resources/print_preview/images/cloud_printer_shared_32.png
deleted file mode 100644
index ab256da..0000000
--- a/chrome/browser/resources/print_preview/images/cloud_printer_shared_32.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/print_preview/images/mobile_shared_32.png b/chrome/browser/resources/print_preview/images/mobile_shared_32.png
deleted file mode 100644
index fa71397..0000000
--- a/chrome/browser/resources/print_preview/images/mobile_shared_32.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/print_preview/search/destination_list_item.css b/chrome/browser/resources/print_preview/search/destination_list_item.css
index ca3ec6a..9ea7c92 100644
--- a/chrome/browser/resources/print_preview/search/destination_list_item.css
+++ b/chrome/browser/resources/print_preview/search/destination_list_item.css
@@ -24,7 +24,7 @@
-webkit-transition: opacity 150ms;
display: inline-block;
height: 24px;
- opacity: 0.4;
+ opacity: 0.7;
vertical-align: middle;
width: 24px;
}
diff --git a/chrome/browser/resources/print_preview/settings/destination_settings.css b/chrome/browser/resources/print_preview/settings/destination_settings.css
index b3d540c..01c8cea 100644
--- a/chrome/browser/resources/print_preview/settings/destination_settings.css
+++ b/chrome/browser/resources/print_preview/settings/destination_settings.css
@@ -24,7 +24,7 @@
.destination-settings-icon {
-webkit-margin-end: 8px;
height: 24px;
- opacity: 0.4;
+ opacity: 0.7;
vertical-align: middle;
width: 24px;
}