Integrated new icons into print preview.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10560040

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

7 files changed, 29 insertions, 22 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 8dd0343..da7ea9d 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -106,14 +106,16 @@
       <if expr="pp_ifdef('enable_printing')">
         <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_preview.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
-                 file="resources\print_preview\images\printer.png" type="BINDATA" />
-        <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
-                 file="resources\print_preview\images\printer_shared.png" type="BINDATA" />
-        <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_PROMOTED_PRINTER_32"
-                 file="resources\print_preview\images\google_promoted_printer_32.png" type="BINDATA" />
-        <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_32"
-                 file="resources\print_preview\images\mobile_32.png" type="BINDATA" />
+        <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_24"
+                 file="resources\print_preview\images\printer_24.png" type="BINDATA" />
+        <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED_24"
+                 file="resources\print_preview\images\printer_shared_24.png" type="BINDATA" />
+        <include name="IDR_PRINT_PREVIEW_IMAGES_SERVICE_PRINTER_24"
+                 file="resources\print_preview\images\service_printer_24.png" type="BINDATA" />
+        <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_PRINTER_24"
+                 file="resources\print_preview\images\mobile_printer_24.png" type="BINDATA" />
+        <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_PRINTER_SHARED_24"
+                 file="resources\print_preview\images\mobile_printer_shared_24.png" type="BINDATA" />
       </if>
       <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/resources/print_preview/data/destination.js b/chrome/browser/resources/print_preview/data/destination.js
index 769fb74..c20c15a2 100644
--- a/chrome/browser/resources/print_preview/data/destination.js
+++ b/chrome/browser/resources/print_preview/data/destination.js
@@ -149,11 +149,12 @@ cr.define('print_preview', function() {
    * @private
    */
   Destination.IconUrl_ = {
-    CLOUD: 'images/printer.png',
-    CLOUD_SHARED: 'images/printer_shared.png',
-    LOCAL: 'images/printer.png',
-    MOBILE: 'images/mobile_32.png',
-    GOOGLE_PROMOTED: 'images/google_promoted_printer_32.png'
+    CLOUD: 'images/printer_24.png',
+    CLOUD_SHARED: 'images/printer_shared_24.png',
+    LOCAL: 'images/printer_24.png',
+    MOBILE: 'images/mobile_printer_24.png',
+    MOBILE_SHARED: 'images/mobile_printer_shared_24.png',
+    GOOGLE_PROMOTED: 'images/service_printer_24.png'
   };
 
   Destination.prototype = {
@@ -275,8 +276,10 @@ cr.define('print_preview', function() {
         return Destination.IconUrl_.GOOGLE_PROMOTED;
       } else if (this.isLocal) {
         return Destination.IconUrl_.LOCAL;
-      } else if (this.type_ == Destination.Type.MOBILE) {
+      } else if (this.type_ == Destination.Type.MOBILE && this.isOwned_) {
         return Destination.IconUrl_.MOBILE;
+      } else if (this.type_ == Destination.Type.MOBILE) {
+        return Destination.IconUrl_.MOBILE_SHARED;
       } else if (this.isOwned_) {
         return Destination.IconUrl_.CLOUD;
       } else {
diff --git a/chrome/browser/resources/print_preview/images/google_promoted_printer_32.png b/chrome/browser/resources/print_preview/images/google_promoted_printer_32.png
deleted file mode 100644
index cfd6dbb..0000000
--- a/chrome/browser/resources/print_preview/images/google_promoted_printer_32.png
+++ /dev/null
diff --git a/chrome/browser/resources/print_preview/images/mobile_32.png b/chrome/browser/resources/print_preview/images/mobile_32.png
deleted file mode 100644
index 8f2bb9a..0000000
--- a/chrome/browser/resources/print_preview/images/mobile_32.png
+++ /dev/null
diff --git a/chrome/browser/resources/print_preview/images/printer.png b/chrome/browser/resources/print_preview/images/printer.png
deleted file mode 100644
index d6d62ed..0000000
--- a/chrome/browser/resources/print_preview/images/printer.png
+++ /dev/null
diff --git a/chrome/browser/resources/print_preview/images/printer_shared.png b/chrome/browser/resources/print_preview/images/printer_shared.png
deleted file mode 100644
index 3b27572..0000000
--- a/chrome/browser/resources/print_preview/images/printer_shared.png
+++ /dev/null
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_data_source.cc b/chrome/browser/ui/webui/print_preview/print_preview_data_source.cc
index 26c8fdb..4fc44d0 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_data_source.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_data_source.cc
@@ -165,14 +165,16 @@ void PrintPreviewDataSource::Init() {
 
   set_json_path("strings.js");
   add_resource_path("print_preview.js", IDR_PRINT_PREVIEW_JS);
-  add_resource_path("images/printer.png",
-                    IDR_PRINT_PREVIEW_IMAGES_PRINTER);
-  add_resource_path("images/printer_shared.png",
-                      IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED);
-  add_resource_path("images/google_promoted_printer_32.png",
-                    IDR_PRINT_PREVIEW_IMAGES_GOOGLE_PROMOTED_PRINTER_32);
-  add_resource_path("images/mobile_32.png",
-                    IDR_PRINT_PREVIEW_IMAGES_MOBILE_32);
+  add_resource_path("images/printer_24.png",
+                    IDR_PRINT_PREVIEW_IMAGES_PRINTER_24);
+  add_resource_path("images/printer_shared_24.png",
+                    IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED_24);
+  add_resource_path("images/service_printer_24.png",
+                    IDR_PRINT_PREVIEW_IMAGES_SERVICE_PRINTER_24);
+  add_resource_path("images/mobile_printer_24.png",
+                    IDR_PRINT_PREVIEW_IMAGES_MOBILE_PRINTER_24);
+  add_resource_path("images/mobile_printer_shared_24.png",
+                    IDR_PRINT_PREVIEW_IMAGES_MOBILE_PRINTER_SHARED_24);
   set_default_resource(IDR_PRINT_PREVIEW_HTML);
 }