summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-17 15:38:26 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-17 15:38:26 +0000
commit78930c94c10bd387717749686097273af9272dfd (patch)
treeefefff9a79b2502e6ec7417d8ee6ea6b9bdee52c /extensions
parent207fd95a3ef0b9acac144f8ce0e696eaad5252c0 (diff)
downloadchromium_src-78930c94c10bd387717749686097273af9272dfd.zip
chromium_src-78930c94c10bd387717749686097273af9272dfd.tar.gz
chromium_src-78930c94c10bd387717749686097273af9272dfd.tar.bz2
Remove media_galleries_handlers - not used.
According to crbug.com/307827 - the code that used media_galleries_handlers has been removed. BUG=NONE NOTRY=true Review URL: https://codereview.chromium.org/338473003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/extension_function_histogram_value.h2
-rw-r--r--extensions/common/extension_l10n_util.cc16
-rw-r--r--extensions/common/manifest_constants.cc3
-rw-r--r--extensions/common/manifest_constants.h2
4 files changed, 1 insertions, 22 deletions
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h
index 388a113..e764408 100644
--- a/extensions/browser/extension_function_histogram_value.h
+++ b/extensions/browser/extension_function_histogram_value.h
@@ -495,7 +495,7 @@ enum HistogramValue {
WALLPAPERPRIVATE_SETCUSTOMWALLPAPERLAYOUT,
DOWNLOADSINTERNAL_DETERMINEFILENAME,
SYNCFILESYSTEM_GETFILESYNCSTATUSES,
- MEDIAGALLERIESPRIVATE_GETHANDLERS,
+ DELETED_MEDIAGALLERIESPRIVATE_GETHANDLERS,
WALLPAPERPRIVATE_RESETWALLPAPER,
DEVELOPERPRIVATE_PERMISSIONS,
WEBSTOREPRIVATE_ENABLEAPPLAUNCHER,
diff --git a/extensions/common/extension_l10n_util.cc b/extensions/common/extension_l10n_util.cc
index 1bea9bd..24af4b7 100644
--- a/extensions/common/extension_l10n_util.cc
+++ b/extensions/common/extension_l10n_util.cc
@@ -184,22 +184,6 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
}
}
- base::ListValue* media_galleries_handlers = NULL;
- if (manifest->GetList(keys::kMediaGalleriesHandlers,
- &media_galleries_handlers)) {
- key.assign(keys::kMediaGalleriesHandlers);
- for (size_t i = 0; i < media_galleries_handlers->GetSize(); i++) {
- base::DictionaryValue* handler = NULL;
- if (!media_galleries_handlers->GetDictionary(i, &handler)) {
- *error = errors::kInvalidMediaGalleriesHandler;
- return false;
- }
- if (!LocalizeManifestValue(
- keys::kPageActionDefaultTitle, messages, handler, error))
- return false;
- }
- }
-
// Initialize all input_components
base::ListValue* input_components = NULL;
if (manifest->GetList(keys::kInputComponents, &input_components)) {
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index 194369c..f03bd42 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -44,7 +44,6 @@ const char kExternallyConnectable[] = "externally_connectable";
const char kFileAccessList[] = "file_access";
const char kFileFilters[] = "file_filters";
const char kFileBrowserHandlers[] = "file_browser_handlers";
-const char kMediaGalleriesHandlers[] = "media_galleries_handlers";
const char kFileHandlers[] = "file_handlers";
const char kFileHandlerExtensions[] = "extensions";
const char kFileHandlerTitle[] = "title";
@@ -347,8 +346,6 @@ const char kInvalidFileAccessValue[] =
"Invalid value for 'file_access[*]'.";
const char kInvalidFileBrowserHandler[] =
"Invalid value for 'file_browser_handlers'.";
-const char kInvalidMediaGalleriesHandler[] =
- "Invalid value for 'media_galleries_handlers'.";
const char kInvalidFileFiltersList[] =
"Invalid value for 'file_filters'.";
const char kInvalidFileFilterValue[] =
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index df9384d..4b47c8e 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -86,7 +86,6 @@ extern const char kLayouts[];
extern const char kManifestVersion[];
extern const char kMatchAboutBlank[];
extern const char kMatches[];
-extern const char kMediaGalleriesHandlers[];
extern const char kMIMETypes[];
extern const char kMimeTypesHandler[];
extern const char kMinimumChromeVersion[];
@@ -298,7 +297,6 @@ extern const char kInvalidFileAccessList[];
extern const char kInvalidFileAccessValue[];
extern const char kInvalidFileBrowserHandler[];
extern const char kInvalidFileBrowserHandlerMIMETypes[];
-extern const char kInvalidMediaGalleriesHandler[];
extern const char kInvalidFileFiltersList[];
extern const char kInvalidFileFilterValue[];
extern const char kInvalidFileHandlers[];