summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chromeos/file_manager/file_manager_browsertest.cc7
-rw-r--r--chrome/browser/extensions/component_loader.cc4
-rw-r--r--chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json2
-rw-r--r--chrome/test/data/extensions/api_test/file_manager_browsertest/open_zip_files.js (renamed from chrome/test/data/extensions/api_test/file_manager_browsertest/open_special_types.js)63
-rw-r--r--chromeos/chromeos_switches.cc4
-rw-r--r--chromeos/chromeos_switches.h1
-rw-r--r--ui/file_manager/file_manager/manifest.json15
-rw-r--r--ui/file_manager/gallery/manifest.json4
8 files changed, 9 insertions, 91 deletions
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index f3b9f74..4d34c76 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -722,12 +722,9 @@ INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "fileDisplayDrive")));
INSTANTIATE_TEST_CASE_P(
- OpenSpecialTypes,
+ OpenZipFiles,
FileManagerBrowserTest,
- ::testing::Values(TestParameter(IN_GUEST_MODE, "galleryOpenDownloads"),
- TestParameter(NOT_IN_GUEST_MODE, "galleryOpenDownloads"),
- TestParameter(NOT_IN_GUEST_MODE, "galleryOpenDrive"),
- TestParameter(IN_GUEST_MODE, "zipOpenDownloads"),
+ ::testing::Values(TestParameter(IN_GUEST_MODE, "zipOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "zipOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "zipOpenDrive")));
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 99129d8..bad3962 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -296,7 +296,9 @@ void ComponentLoader::AddVideoPlayerExtension() {
}
void ComponentLoader::AddGalleryExtension() {
- // TODO(hirono): Disable the new experimental gallery in M36 temporarily.
+#if defined(OS_CHROMEOS)
+ Add(IDR_GALLERY_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gallery")));
+#endif
}
void ComponentLoader::AddHangoutServicesExtension() {
diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json b/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json
index 2663b55..97d94de 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/manifest.json
@@ -19,7 +19,7 @@
"multi_profile.js",
"navigation_list.js",
"open_audio_files.js",
- "open_special_types.js",
+ "open_zip_files.js",
"open_video_files.js",
"restore_geometry.js",
"restore_prefs.js",
diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/open_special_types.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/open_zip_files.js
index 1fd97e3..d76897a 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/open_special_types.js
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/open_zip_files.js
@@ -1,63 +1,10 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
'use strict';
/**
- * Tests if the gallery shows up for the selected image and that the image
- * gets displayed.
- *
- * @param {string} path Directory path to be tested.
- */
-function galleryOpen(path) {
- var appId;
- StepsRunner.run([
- function() {
- setupAndWaitUntilReady(null, path, this.next);
- },
- // Resize the window to desired dimensions to avoid flakyness.
- function(inAppId) {
- appId = inAppId;
- callRemoteTestUtil('resizeWindow',
- appId,
- [480, 480],
- this.next);
- },
- // Select the image.
- function(result) {
- chrome.test.assertTrue(result);
- callRemoteTestUtil('openFile',
- appId,
- ['My Desktop Background.png'],
- this.next);
- },
- // Wait for the image in the gallery's screen image.
- function(result) {
- chrome.test.assertTrue(result);
- waitForElement(appId,
- '.gallery .content canvas.image',
- 'iframe.overlay-pane').then(this.next);
- },
- // Verify the gallery's screen image.
- function(element) {
- chrome.test.assertEq('480', element.attributes.width);
- chrome.test.assertEq('360', element.attributes.height);
- // Get the full-resolution image.
- waitForElement(appId,
- '.gallery .content canvas.fullres',
- 'iframe.overlay-pane').then(this.next);
- },
- // Verify the gallery's full resolution image.
- function(element) {
- chrome.test.assertEq('800', element.attributes.width);
- chrome.test.assertEq('600', element.attributes.height);
- checkIfNoErrorsOccured(this.next);
- }
- ]);
-}
-
-/**
* Tests if we can open and unmount a zip file.
* @param {string} path Directory path to be tested.
*/
@@ -124,14 +71,6 @@ function zipOpen(path) {
]);
}
-testcase.galleryOpenDownloads = function() {
- galleryOpen(RootPath.DOWNLOADS);
-};
-
-testcase.galleryOpenDrive = function() {
- galleryOpen(RootPath.DRIVE);
-};
-
testcase.zipOpenDownloads = function() {
zipOpen(RootPath.DOWNLOADS);
};
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 8369072..7e45887 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -119,10 +119,6 @@ const char kEnterpriseEnrollmentSkipRobotAuth[] =
const char kFileManagerEnableNewAudioPlayer[] =
"file-manager-enable-new-audio-player";
-// Enables the new gallery in the Files.app.
-const char kFileManagerEnableNewGallery[] =
- "file-manager-enable-new-gallery";
-
// Passed to Chrome the first time that it's run after the system boots.
// Not passed on restart after sign out.
const char kFirstExecAfterBoot[] = "first-exec-after-boot";
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 0feff9e..99d3aba 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -51,7 +51,6 @@ CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentInitialModulus[];
CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentModulusLimit[];
CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentSkipRobotAuth[];
CHROMEOS_EXPORT extern const char kFileManagerEnableNewAudioPlayer[];
-CHROMEOS_EXPORT extern const char kFileManagerEnableNewGallery[];
CHROMEOS_EXPORT extern const char kFirstExecAfterBoot[];
CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[];
CHROMEOS_EXPORT extern const char kGuestSession[];
diff --git a/ui/file_manager/file_manager/manifest.json b/ui/file_manager/file_manager/manifest.json
index cc6f571..89df0c4 100644
--- a/ui/file_manager/file_manager/manifest.json
+++ b/ui/file_manager/file_manager/manifest.json
@@ -95,21 +95,6 @@
]
},
{
- "id": "gallery",
- "default_title": "__MSG_OPEN_ACTION__",
- "default_icon": "common/images/file_types/200/image.png",
- "file_filters": [
- // Image formats
- "filesystem:*.bmp",
- "filesystem:*.gif",
- "filesystem:*.ico",
- "filesystem:*.jpg",
- "filesystem:*.jpeg",
- "filesystem:*.png",
- "filesystem:*.webp"
- ]
- },
- {
"id": "gallery-video",
"default_title": "__MSG_OPEN_ACTION__",
"default_icon": "common/images/file_types/200/image.png",
diff --git a/ui/file_manager/gallery/manifest.json b/ui/file_manager/gallery/manifest.json
index 0d9dd18..5f90a56 100644
--- a/ui/file_manager/gallery/manifest.json
+++ b/ui/file_manager/gallery/manifest.json
@@ -25,7 +25,7 @@
"chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj"
],
"file_handlers": {
- "video": {
+ "image": {
"types": [
"image/*"
],
@@ -39,7 +39,7 @@
"webp"
],
// TODO(hirono): Rename and localize this.
- "title": "Open in new Gallery"
+ "title": "Open"
}
},
"app": {
generated by cgit v1.1 at 2025-02-09 02:13:50 +0000