summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd5
-rw-r--r--chrome/browser/about_flags.cc9
-rw-r--r--chrome/browser/extensions/extension_file_browser_private_api.cc7
-rw-r--r--chrome/browser/resources/file_manager/js/file_manager.js22
-rw-r--r--chrome/browser/resources/file_manager/js/mock_chrome.js1
-rw-r--r--chrome/browser/resources/file_manager/manifest.json13
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
8 files changed, 4 insertions, 57 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 41c9e44..347fa5f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4933,11 +4933,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION" desc="Description for the flag to enable extension alerts.">
Enable various alerts about changes in extension state.
</message>
- <message name="IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME" desc="Title for the flag to enable the photo editor.">
- Photo Editor
- </message>
- <message name="IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION" desc="Description for the flag to enable the photo editor.">
- </message>
<message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME" desc="Title for the flag to enable the Media Source API on &lt;video&gt; elements.">
Enable Media Source API on &lt;video&gt; elements.
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a5bca11..52208be 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -399,15 +399,6 @@ const Experiment kExperiments[] = {
kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts)
},
-#if defined(OS_CHROMEOS)
- {
- "enable-photo-editor",
- IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME,
- IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION,
- kOsCrOS,
- SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor)
- },
-#endif
{
"enable-media-source",
IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME,
diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc
index c6456c0..7f71b39 100644
--- a/chrome/browser/extensions/extension_file_browser_private_api.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_api.cc
@@ -1679,15 +1679,8 @@ bool FileDialogStringsFunction::RunImpl() {
ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict);
- // TODO(serya): Create a new string in .grd file for this one in M13.
- dict->SetString("PREVIEW_IMAGE",
- l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
dict->SetString("PLAY_MEDIA",
l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
-#if defined(OS_CHROMEOS)
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePhotoEditor))
- dict->SetString("ENABLE_PHOTO_EDITOR", "true");
-#endif
return true;
}
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index af830bb..3d6e2c3 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -7,8 +7,6 @@
const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
+ 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
-var g_slideshow_data = null;
-
// If directory files changes too often, don't rescan directory more than once
// per specified interval
const SIMULTANEOUS_RESCAN_INTERVAL = 1000;
@@ -2090,15 +2088,9 @@ FileManager.prototype = {
var task_parts = task.taskId.split('|');
if (task_parts[0] == this.getExtensionId_()) {
task.internal = true;
- if (task_parts[1] == 'preview') {
- // TODO(serya): This hack needed until task.iconUrl get working
- // (see GetFileTasksFileBrowserFunction::RunImpl).
- task.iconUrl =
- chrome.extension.getURL('images/icon_preview_16x16.png');
- task.title = str('PREVIEW_IMAGE');
- // Do not create the Slideshow button if the Gallery is present.
- if (str('ENABLE_PHOTO_EDITOR')) continue;
- } else if (task_parts[1] == 'play') {
+ if (task_parts[1] == 'play') {
+ // TODO(serya): This hack needed until task.iconUrl is working
+ // (see GetFileTasksFileBrowserFunction::RunImpl).
task.iconUrl =
chrome.extension.getURL('images/icon_play_16x16.png');
task.title = str('PLAY_MEDIA').replace("&", "");
@@ -2115,9 +2107,6 @@ FileManager.prototype = {
chrome.extension.getURL('images/icon_preview_16x16.png');
task.title = str('GALLERY');
task.allTasks = tasksList;
-
- // Skip the button creation.
- if (!str('ENABLE_PHOTO_EDITOR')) continue;
this.galleryTask_ = task;
}
}
@@ -2306,10 +2295,7 @@ FileManager.prototype = {
*/
FileManager.prototype.onFileTaskExecute_ = function(id, details) {
var urls = details.urls;
- if (id == 'preview') {
- g_slideshow_data = urls;
- chrome.tabs.create({url: "slideshow.html"});
- } else if (id == 'play' || id == 'enqueue') {
+ if (id == 'play' || id == 'enqueue') {
chrome.fileBrowserPrivate.viewFiles(urls, id);
} else if (id == 'mount-archive') {
for (var index = 0; index < urls.length; ++index) {
diff --git a/chrome/browser/resources/file_manager/js/mock_chrome.js b/chrome/browser/resources/file_manager/js/mock_chrome.js
index 17898e4..7f0df01 100644
--- a/chrome/browser/resources/file_manager/js/mock_chrome.js
+++ b/chrome/browser/resources/file_manager/js/mock_chrome.js
@@ -247,7 +247,6 @@ chrome.fileBrowserPrivate = {
UNMOUNT_ARCHIVE: 'Close archive',
FORMAT_DEVICE: 'Format device',
- ENABLE_PHOTO_EDITOR: 'true',
GALLERY: 'View and Edit',
GALLERY_EDIT: 'Edit',
GALLERY_SHARE: 'Share',
diff --git a/chrome/browser/resources/file_manager/manifest.json b/chrome/browser/resources/file_manager/manifest.json
index 326665e..e6cf358 100644
--- a/chrome/browser/resources/file_manager/manifest.json
+++ b/chrome/browser/resources/file_manager/manifest.json
@@ -26,19 +26,6 @@
},
"file_browser_handlers": [
{
- "id": "preview",
- "default_title": "__MSG_PREVIEW_IMAGE__",
- "default_icon": "images/icon_preview_16x16.png",
- "file_filters": [
- "filesystem:*.bmp",
- "filesystem:*.gif",
- "filesystem:*.jpg",
- "filesystem:*.jpeg",
- "filesystem:*.webp",
- "filesystem:*.png"
- ]
- },
- {
"id": "play",
"default_title": "__MSG_PLAY_MEDIA__",
"default_icon": "images/icon_play_16x16.png",
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e27dc09..bf4e4ab 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1201,9 +1201,6 @@ const char kCompressSystemFeedback[] = "compress-sys-feedback";
// Enables overriding the path for the default authentication extension.
const char kAuthExtensionPath[] = "auth-ext-path";
-// Enables photo editor in file manager.
-const char kEnablePhotoEditor[] = "enable-photo-editor";
-
#ifndef NDEBUG
// Skips all other OOBE pages after user login.
const char kOobeSkipPostLogin[] = "oobe-skip-postlogin";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1491751..2517477 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -332,7 +332,6 @@ extern const char kStubCros[];
extern const char kScreenSaverUrl[];
extern const char kCompressSystemFeedback[];
extern const char kAuthExtensionPath[];
-extern const char kEnablePhotoEditor[];
#ifndef NDEBUG
extern const char kOobeSkipPostLogin[];
#endif
generated by cgit v1.1 at 2025-02-19 05:07:02 +0000