Merge 229723 "Fix cropping cursors in the gallery."

chrome/browser/resources/file_manager/css/gallery.css

 /* Copyright (c) 2012 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. */
 
 body {
   -webkit-user-select: none;
   font-family: Open Sans, Droid Sans Fallback, sans-serif;
   font-size: 84%;
   margin: 0;
 }
@@ skipping 61 matching lines @@
   cursor: wait;
 }
 
 .gallery[tools] .image-container[cursor='default'] {
   cursor: default;
 }
 
 .gallery[tools] .image-container[cursor='move'] {
   cursor: -webkit-image-set(
     url('../images/gallery/cursor_move.png') 1x,
-    url('../images/gallery/2x/cursor_move.png') 2x) 15 15;
+    url('../images/gallery/2x/cursor_move.png') 2x) 15 15, auto;
 }
 
 .gallery[tools] .image-container[cursor='crop'] {
   cursor: -webkit-image-set(
     url('../images/gallery/cursor_crop.png') 1x,
-    url('../images/gallery/2x/cursor_crop.png') 2x) 15 15;
+    url('../images/gallery/2x/cursor_crop.png') 2x) 15 15, auto;
 }
 
 .gallery[tools] .image-container[cursor='n-resize'],
 .gallery[tools] .image-container[cursor='s-resize'] {
   cursor: -webkit-image-set(
     url('../images/gallery/cursor_updown.png') 1x,
-    url('../images/gallery/2x/cursor_updown.png') 2x) 15 15;
+    url('../images/gallery/2x/cursor_updown.png') 2x) 15 15, auto;
 }
 
 .gallery[tools] .image-container[cursor='e-resize'],
 .gallery[tools] .image-container[cursor='w-resize'] {
   cursor: -webkit-image-set(
     url('../images/gallery/cursor_leftright.png') 1x,
-    url('../images/gallery/2x/cursor_leftright.png') 2x) 15 15;
+    url('../images/gallery/2x/cursor_leftright.png') 2x) 15 15, auto;
 }
 
 .gallery[tools] .image-container[cursor='nw-resize'],
 .gallery[tools] .image-container[cursor='se-resize'] {
   cursor: -webkit-image-set(
     url('../images/gallery/cursor_nwse.png') 1x,
-    url('../images/gallery/2x/cursor_nwse.png') 2x) 15 15;
+    url('../images/gallery/2x/cursor_nwse.png') 2x) 15 15, auto;
 }
 
 .gallery[tools] .image-container[cursor='ne-resize'],
 .gallery[tools] .image-container[cursor='sw-resize'] {
   cursor: -webkit-image-set(
     url('../images/gallery/cursor_swne.png') 1x,
-    url('../images/gallery/2x/cursor_swne.png') 2x) 15 15;
+    url('../images/gallery/2x/cursor_swne.png') 2x) 15 15, auto;
 }
 
 .gallery .image-container > .image {
   pointer-events: none;
   position: absolute;
   /* Duration and timing function are set in Javascript. */
   transition-property: -webkit-transform, opacity;
 }
 
 .gallery .image-container > .image[fade] {
@@ skipping 1244 matching lines @@
   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);
 }
 
 .gallery > .header > .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);
 }