Remove the pointer cursor and focus state

Removed the pointer cursor and focus state when the checkbox is
disabled.  This should prevent the checkbox from maintaining any
unnecessary focus as well as preventing any confusion when hovering
over the overwrite changes checkbox.

Bug: 888464
Change-Id: I14547deb878f2948e5606f3bf0bbc01b9ba75886
Reviewed-on: https://chromium-review.googlesource.com/c/1318062Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606674}

ui/file_manager/gallery/css/gallery.css

@@ -531,8 +531,8 @@ html[dir='rtl'] .gallery .toolbar .bubble {
   width: 100%;
 }
 
-.gallery .edit-mode-toolbar .options > *,
-.gallery .edit-mode-toolbar .exit-button-spacer > * {
+.gallery .edit-mode-toolbar .options > :not([disabled]),
+.gallery .edit-mode-toolbar .exit-button-spacer > :not([disabled]) {
   pointer-events: auto;
 }
 

ui/file_manager/integration_tests/gallery/photo_editor.js

@@ -275,55 +275,76 @@ function resizeImage(testVolumeName, volumeType) {
 function enableDisableOverwriteOriginalCheckbox(testVolumeName, volumeType) {
   var appId;
   var launchedPromise = setupPhotoEditor(testVolumeName, volumeType);
-  return launchedPromise.then(function(result) {
-    appId = result.appId;
+  return launchedPromise
+      .then(function(result) {
+        appId = result.appId;
 
-    // Confirm overwrite original checkbox is enabled and checked.
-    return gallery.waitForElement(appId,
-        '.overwrite-original[checked]:not([disabled])');
-  }).then(function() {
-    // Uncheck overwrite original.
-    return gallery.waitAndClickElement(appId, '.overwrite-original');
-  }).then(function() {
-    // Rotate image.
-    return gallery.waitAndClickElement(appId, '.rotate_right');
-  }).then(function() {
-    // Confirm that edited image has been saved.
-    return gallery.waitForAFile(volumeType,
-        'My Desktop Background - Edited.png');
-  }).then(function() {
-    // Confirm overwrite original checkbox is disabled and not checked.
-    return gallery.waitForElement(appId,
-        '.overwrite-original[disabled]:not([checked])');
-  }).then(function() {
-    // Go back to the slide mode.
-    return gallery.waitAndClickElement(appId, 'button.edit');
-  }).then(function() {
-    // Confirm current image is My Desktop Background - Edited.png.
-    return gallery.waitForSlideImage(appId, 600, 800,
-        'My Desktop Background - Edited');
-  }).then(function() {
-    // Move to My Desktop Background.png. Switching to other image is required
-    // to end edit session of the edited image.
-    return gallery.waitAndClickElement(appId, '.arrow.right');
-  }).then(function() {
-    // Confirm current image has changed to another image.
-    return gallery.waitForSlideImage(appId, 800, 600, 'My Desktop Background');
-  }).then(function() {
-    // Back to the edited image.
-    return gallery.waitAndClickElement(appId, '.arrow.left');
-  }).then(function() {
-    // Confirm current image is switched to My Desktop Background - Edited.png.
-    return gallery.waitForSlideImage(appId, 600, 800,
-        'My Desktop Background - Edited');
-  }).then(function() {
-    // Click edit button again.
-    return gallery.waitAndClickElement(appId, 'button.edit');
-  }).then(function() {
-    // Confirm overwrite original checkbox is enabled and not checked.
-    return gallery.waitForElement(appId,
-        '.overwrite-original:not([checked]):not([disabled])');
-  });
+        // Confirm overwrite original checkbox is enabled and checked.
+        return gallery.waitForElementStyles(
+            appId, '.overwrite-original[checked]:not([disabled])', ['cursor']);
+      })
+      .then(function(result) {
+        // Ensure that checkbox cursor style takes pointer state when enabled.
+        // https://crbug.com/888464
+        chrome.test.assertEq('pointer', result.styles.cursor);
+        // Uncheck overwrite original.
+        return gallery.waitAndClickElement(appId, '.overwrite-original');
+      })
+      .then(function() {
+        // Rotate image.
+        return gallery.waitAndClickElement(appId, '.rotate_right');
+      })
+      .then(function() {
+        // Confirm that edited image has been saved.
+        return gallery.waitForAFile(
+            volumeType, 'My Desktop Background - Edited.png');
+      })
+      .then(function() {
+        // Confirm overwrite original checkbox is disabled and not checked.
+        return gallery.waitForElementStyles(
+            appId, '.overwrite-original[disabled]:not([checked])', ['cursor']);
+      })
+      .then(function(result) {
+        // Ensure that checkbox cursor style takes auto state when disabled.
+        // https://crbug.com/888464
+        chrome.test.assertEq('auto', result.styles.cursor);
+        // Go back to the slide mode.
+        return gallery.waitAndClickElement(appId, 'button.edit');
+      })
+      .then(function() {
+        // Confirm current image is My Desktop Background - Edited.png.
+        return gallery.waitForSlideImage(
+            appId, 600, 800, 'My Desktop Background - Edited');
+      })
+      .then(function() {
+        // Move to My Desktop Background.png. Switching to other image is
+        // required to end edit session of the edited image.
+        return gallery.waitAndClickElement(appId, '.arrow.right');
+      })
+      .then(function() {
+        // Confirm current image has changed to another image.
+        return gallery.waitForSlideImage(
+            appId, 800, 600, 'My Desktop Background');
+      })
+      .then(function() {
+        // Back to the edited image.
+        return gallery.waitAndClickElement(appId, '.arrow.left');
+      })
+      .then(function() {
+        // Confirm current image is switched to My Desktop Background -
+        // Edited.png.
+        return gallery.waitForSlideImage(
+            appId, 600, 800, 'My Desktop Background - Edited');
+      })
+      .then(function() {
+        // Click edit button again.
+        return gallery.waitAndClickElement(appId, 'button.edit');
+      })
+      .then(function() {
+        // Confirm overwrite original checkbox is enabled and not checked.
+        return gallery.waitForElement(
+            appId, '.overwrite-original:not([checked]):not([disabled])');
+      });
 }
 
 /**