summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrob <rob@robwu.nl>2014-12-13 12:31:52 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-13 20:32:16 +0000
commit395281f6ca0fafd8f5cc9ee96461beed4351671d (patch)
tree1e6e2921a7e2e491a450cece5abbe7e3d6c000bf
parent4bcd29c92ae0ad893f34c8af246d1cfbe904bb32 (diff)
downloadchromium_src-395281f6ca0fafd8f5cc9ee96461beed4351671d.zip
chromium_src-395281f6ca0fafd8f5cc9ee96461beed4351671d.tar.gz
chromium_src-395281f6ca0fafd8f5cc9ee96461beed4351671d.tar.bz2
Remove dead script_badge code.
BUG=302083 R=thakis@chromium.org R=kalman@chromium.org Review URL: https://codereview.chromium.org/730983002 Cr-Commit-Position: refs/heads/master@{#308286}
-rw-r--r--build/android/pylib/gtest/filter/unit_tests_disabled1
-rw-r--r--chrome/app/generated_resources.grd8
-rw-r--r--chrome/browser/browser_resources.grd3
-rw-r--r--chrome/browser/extensions/extension_view_host_factory.cc3
-rw-r--r--chrome/browser/resources/extensions/extension_info.css44
-rw-r--r--chrome/browser/resources/extensions/extension_info.html31
-rw-r--r--chrome/browser/resources/extensions/extension_info.js23
-rw-r--r--chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm3
-rw-r--r--chrome/common/extensions/api/_api_features.json4
-rw-r--r--chrome/common/extensions/api/_manifest_features.json4
-rw-r--r--chrome/common/extensions/api/script_badge.json89
-rw-r--r--chrome/common/extensions/chrome_extensions_client.cc2
-rw-r--r--chrome/common/extensions/docs/server2/known_broken_links.json6
-rw-r--r--chrome/common/extensions_api_resources.grd1
-rw-r--r--chrome/common/url_constants.cc2
-rw-r--r--chrome/common/url_constants.h2
-rw-r--r--chrome/test/data/extensions/api_test/keybinding/script_badge/background.js5
-rw-r--r--chrome/test/data/extensions/api_test/keybinding/script_badge/manifest.json19
-rw-r--r--chrome/test/data/extensions/api_test/keybinding/script_badge/popup.html10
-rw-r--r--chrome/test/data/extensions/api_test/keybinding/script_badge/popup.js5
-rw-r--r--chrome/test/data/extensions/api_test/keybinding/script_badge/show.html10
-rw-r--r--chrome/test/data/extensions/api_test/keybinding/script_badge/show.js9
-rw-r--r--extensions/common/manifest_constants.cc12
-rw-r--r--extensions/common/manifest_constants.h6
24 files changed, 0 insertions, 302 deletions
diff --git a/build/android/pylib/gtest/filter/unit_tests_disabled b/build/android/pylib/gtest/filter/unit_tests_disabled
index 6e7be1a..93defbe 100644
--- a/build/android/pylib/gtest/filter/unit_tests_disabled
+++ b/build/android/pylib/gtest/filter/unit_tests_disabled
@@ -67,7 +67,6 @@ PageActionControllerTest.*
PermissionsUpdaterTest.*
ImageLoaderTest.*
ImageLoadingTrackerTest.*
-ScriptBadgeControllerTest.*
ExtensionSettingsFrontendTest.*
ExtensionSettingsSyncTest.*
ExtensionUpdaterTest.*
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2cb7619..46258b0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5221,14 +5221,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
This extension can read and change your information on all websites including Google, Facebook, Yahoo, etc.
</message>
- <!-- chrome://extension-info bubble -->
- <message name="IDS_EXTENSION_SCRIPT_POPUP_IS_RUNNING" desc="The label in the extension info bubble that indicates the extension is running scripts on this page">
- <ph name="EXTENSION_NAME">$1<ex>AdBlock</ex></ph> is running on this page.
- </message>
- <message name="IDS_EXTENSION_SCRIPT_POPUP_LAST_UPDATED" desc="The label in the extension info bubble indicating the last time an extension was updated.">
- Last updated:
- </message>
-
<!-- Global error messages for extensions -->
<message name="IDS_EXTENSION_WARNINGS_WRENCH_MENU_ITEM" desc="The wrench menu item indicating that extensions caused problems.">
Extension error
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 3d604fc..c34bc62 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -143,9 +143,6 @@
<include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar.css" flattenhtml="true" type="BINDATA" />
</if>
<include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension_list.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extension_info.css" flattenhtml="true" type="BINDATA" />
- <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\extension_info.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extension_info.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js" flattenhtml="true" type="BINDATA" />
</if>
<include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.json" type="BINDATA" />
diff --git a/chrome/browser/extensions/extension_view_host_factory.cc b/chrome/browser/extensions/extension_view_host_factory.cc
index 38e2e73..b8565c2 100644
--- a/chrome/browser/extensions/extension_view_host_factory.cc
+++ b/chrome/browser/extensions/extension_view_host_factory.cc
@@ -80,9 +80,6 @@ const Extension* GetExtensionForUrl(Profile* profile, const GURL& url) {
if (!registry)
return NULL;
std::string extension_id = url.host();
- if (url.SchemeIs(content::kChromeUIScheme) &&
- url.host() == chrome::kChromeUIExtensionInfoHost)
- extension_id = url.path().substr(1);
return registry->enabled_extensions().GetByID(extension_id);
}
diff --git a/chrome/browser/resources/extensions/extension_info.css b/chrome/browser/resources/extensions/extension_info.css
deleted file mode 100644
index c510609..0000000
--- a/chrome/browser/resources/extensions/extension_info.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 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 {
- font-family: 'DejaVu Sans', Arial, sans-serif;
- margin: 8px;
- max-width: 480px;
- min-width: 360px;
-}
-
-#extension-item {
- background-repeat: no-repeat;
- display: -webkit-box;
- min-height: 48px;
-}
-
-#extension-title-running {
- -webkit-padding-end: 5px;
- font-size: 1.2em;
- font-weight: 500;
- padding-bottom: 5px;
-}
-
-#extension-last-updated,
-#extension-update-time {
- -webkit-padding-end: 7px;
- color: rgb(78, 83, 86);
- font-size: 1em;
- font-weight: 400;
-}
-
-#extension-description {
- -webkit-padding-end: 5px;
- color: rgb(121, 126, 130);
- font-size: 1em;
- margin: 5px 0;
- white-space: normal;
-}
-
-#extension-details {
- -webkit-box-flex: 1;
- -webkit-padding-start: 57px;
-}
diff --git a/chrome/browser/resources/extensions/extension_info.html b/chrome/browser/resources/extensions/extension_info.html
deleted file mode 100644
index 237ba2c3..0000000
--- a/chrome/browser/resources/extensions/extension_info.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<html i18n-values="dir:textdirection;">
-<head>
-<meta charset="utf-8">
-<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
-<link rel="stylesheet" href="extension_info.css">
-
-<script src="chrome://resources/js/cr.js"></script>
-<script src="chrome://resources/js/load_time_data.js"></script>
-<script src="chrome://resources/js/util.js"></script>
-
-<script src="chrome://extension-info/extension_info.js"></script>
-</head>
-
-<body>
-
-<div id="extension-item">
- <div id="extension-details">
- <div id="extension-title-running"></div>
- <div>
- <span id="extension-last-updated" i18n-content="lastUpdated"></span>
- <span id="extension-update-time" i18n-content="installTime"></span>
- </div>
- <p id="extension-description" i18n-content="description"></p>
- </div>
-</div>
-
-<script src="chrome://extension-info/strings.js"></script>
-<script src="chrome://resources/js/i18n_template2.js"></script>
-</body>
-</html>
diff --git a/chrome/browser/resources/extensions/extension_info.js b/chrome/browser/resources/extensions/extension_info.js
deleted file mode 100644
index 6bf0062..0000000
--- a/chrome/browser/resources/extensions/extension_info.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.
-
-cr.define('extension_info', function() {
- 'use strict';
-
- /**
- * Initialize the info popup.
- */
- function load() {
- $('extension-item').style.backgroundImage =
- 'url(' + loadTimeData.getString('icon') + ')';
- $('extension-title-running').textContent =
- loadTimeData.getStringF('isRunning', loadTimeData.getString('name'));
- }
-
- return {
- load: load
- };
-});
-
-window.addEventListener('DOMContentLoaded', extension_info.load);
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 3004f2d..5ff6f18 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -285,9 +285,6 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
// Make Mac behavior the same with Windows and others.
if (gPopup) {
std::string extension_id = url.host();
- if (url.SchemeIs(content::kChromeUIScheme) &&
- url.host() == chrome::kChromeUIExtensionInfoHost)
- extension_id = url.path().substr(1);
extensions::ExtensionViewHost* host = [gPopup extensionViewHost];
if (extension_id == host->extension_id()) {
[gPopup close];
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
index 42bf787..ba9a60e 100644
--- a/chrome/common/extensions/api/_api_features.json
+++ b/chrome/common/extensions/api/_api_features.json
@@ -596,10 +596,6 @@
"dependencies": ["permission:rtcPrivate"],
"contexts": ["blessed_extension"]
},
- "scriptBadge": {
- "dependencies": ["manifest:script_badge"],
- "contexts": ["blessed_extension"]
- },
"sessions": {
"dependencies": ["permission:sessions"],
"contexts": ["blessed_extension"]
diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json
index 0eda5b5..825477b 100644
--- a/chrome/common/extensions/api/_manifest_features.json
+++ b/chrome/common/extensions/api/_manifest_features.json
@@ -237,10 +237,6 @@
"extension", "legacy_packaged_app", "hosted_app", "platform_app"
]
},
- "script_badge": {
- "channel": "trunk",
- "extension_types": ["extension"]
- },
"short_name": {
"channel": "stable",
"extension_types": "all"
diff --git a/chrome/common/extensions/api/script_badge.json b/chrome/common/extensions/api/script_badge.json
deleted file mode 100644
index e9051c2..0000000
--- a/chrome/common/extensions/api/script_badge.json
+++ /dev/null
@@ -1,89 +0,0 @@
-// 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.
-
-[
- {
- "namespace": "scriptBadge",
- "description": "Use the <code>chrome.scriptBadge</code> API to control the behaviour of the script badge.",
- "functions": [
- {
- "name": "setPopup",
- "type": "function",
- "description": "Sets the html document to be opened as a popup when the user clicks on the script badge's icon.",
- "parameters": [
- {
- "name": "details",
- "type": "object",
- "properties": {
- "tabId": {"type": "integer", "minimum": 0, "description": "The id of the tab for which you want to modify the script badge."},
- "popup": {
- "type": "string",
- "description": "The html file to show in a popup. If set to the empty string (''), no popup is shown."
- }
- }
- }
- ]
- },
- {
- "name": "getPopup",
- "type": "function",
- "description": "Gets the html document set as the popup for this script badge.",
- "parameters": [
- {
- "name": "details",
- "type": "object",
- "properties": {
- "tabId": {
- "type": "integer",
- "description": "Specify the tab to get the popup from."
- }
- }
- },
- {
- "type": "function",
- "name": "callback",
- "parameters": [
- {
- "name": "result",
- "type": "string"
- }
- ]
- }
- ]
- },
- {
- "name": "getAttention",
- "type": "function",
-
- "description": "Brings the script badge to the attention of the user, imploring her to click. You should call this when you detect that you can do something to a particular tab. Do not call this for every tab. That's tacky. If the user clicks on the badge, the activeTab APIs become available. If the extension has already run on this tab, this call does nothing.",
-
- "parameters": [
- {
- "name": "details",
- "type": "object",
- "properties": {
- "tabId": {
- "type": "integer",
- "description": "Specify the tab to request to act on."
- }
- }
- }
- ]
- }
- ],
- "events": [
- {
- "name": "onClicked",
- "type": "function",
- "description": "Fired when a script badge icon is clicked. This event will not fire if the script badge has a popup.",
- "parameters": [
- {
- "name": "tab",
- "$ref": "tabs.Tab"
- }
- ]
- }
- ]
- }
-]
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index d6c4bff..d3294e5 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -304,8 +304,6 @@ void ChromeExtensionsClient::RegisterAPISchemaResources(
api->RegisterSchemaResource("privacy", IDR_EXTENSION_API_JSON_PRIVACY);
api->RegisterSchemaResource("processes", IDR_EXTENSION_API_JSON_PROCESSES);
api->RegisterSchemaResource("proxy", IDR_EXTENSION_API_JSON_PROXY);
- api->RegisterSchemaResource("scriptBadge",
- IDR_EXTENSION_API_JSON_SCRIPTBADGE);
api->RegisterSchemaResource("ttsEngine", IDR_EXTENSION_API_JSON_TTSENGINE);
api->RegisterSchemaResource("tts", IDR_EXTENSION_API_JSON_TTS);
api->RegisterSchemaResource("types", IDR_EXTENSION_API_JSON_TYPES);
diff --git a/chrome/common/extensions/docs/server2/known_broken_links.json b/chrome/common/extensions/docs/server2/known_broken_links.json
index dd3e6a3..02c5083 100644
--- a/chrome/common/extensions/docs/server2/known_broken_links.json
+++ b/chrome/common/extensions/docs/server2/known_broken_links.json
@@ -1092,12 +1092,6 @@
[
302,
"apps/private_apis.html",
- "apps/scriptBadge.html",
- "redirects to /extensions/scriptBadge.html"
- ],
- [
- 302,
- "apps/private_apis.html",
"apps/sessions.html",
"redirects to /extensions/sessions.html"
],
diff --git a/chrome/common/extensions_api_resources.grd b/chrome/common/extensions_api_resources.grd
index 2bc6b6c..ec1ac98 100644
--- a/chrome/common/extensions_api_resources.grd
+++ b/chrome/common/extensions_api_resources.grd
@@ -19,7 +19,6 @@
<include name="IDR_EXTENSION_API_JSON_PRIVACY" file="extensions\api\privacy.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_PROCESSES" file="extensions\api\processes.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_PROXY" file="extensions\api\proxy.json" type="BINDATA" />
- <include name="IDR_EXTENSION_API_JSON_SCRIPTBADGE" file="extensions\api\script_badge.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\tts_engine.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_TYPES" file="extensions\api\types.json" type="BINDATA" />
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 60d2224..3a147c4 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -43,7 +43,6 @@ const char kChromeUIDomainReliabilityInternalsURL[] =
const char kChromeUIDownloadsURL[] = "chrome://downloads/";
const char kChromeUIEditSearchEngineDialogURL[] = "chrome://editsearchengine/";
const char kChromeUIExtensionIconURL[] = "chrome://extension-icon/";
-const char kChromeUIExtensionInfoURL[] = "chrome://extension-info/";
const char kChromeUIExtensionsFrameURL[] = "chrome://extensions-frame/";
const char kChromeUIExtensionsURL[] = "chrome://extensions/";
const char kChromeUIFaviconURL[] = "chrome://favicon/";
@@ -178,7 +177,6 @@ const char kChromeUIDownloadsHost[] = "downloads";
const char kChromeUIDriveInternalsHost[] = "drive-internals";
const char kChromeUIEditSearchEngineDialogHost[] = "editsearchengine";
const char kChromeUIExtensionIconHost[] = "extension-icon";
-const char kChromeUIExtensionInfoHost[] = "extension-info";
const char kChromeUIExtensionsFrameHost[] = "extensions-frame";
const char kChromeUIExtensionsHost[] = "extensions";
const char kChromeUIFaviconHost[] = "favicon";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index c828a72..f363f39 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -38,7 +38,6 @@ extern const char kChromeUIDomainReliabilityInternalsURL[];
extern const char kChromeUIDownloadsURL[];
extern const char kChromeUIEditSearchEngineDialogURL[];
extern const char kChromeUIExtensionIconURL[];
-extern const char kChromeUIExtensionInfoURL[];
extern const char kChromeUIExtensionsFrameURL[];
extern const char kChromeUIExtensionsURL[];
extern const char kChromeUIFaviconURL[];
@@ -168,7 +167,6 @@ extern const char kChromeUIDownloadsHost[];
extern const char kChromeUIDriveInternalsHost[];
extern const char kChromeUIEditSearchEngineDialogHost[];
extern const char kChromeUIExtensionIconHost[];
-extern const char kChromeUIExtensionInfoHost[];
extern const char kChromeUIExtensionsFrameHost[];
extern const char kChromeUIExtensionsHost[];
extern const char kChromeUIFaviconHost[];
diff --git a/chrome/test/data/extensions/api_test/keybinding/script_badge/background.js b/chrome/test/data/extensions/api_test/keybinding/script_badge/background.js
deleted file mode 100644
index 54c01cf..0000000
--- a/chrome/test/data/extensions/api_test/keybinding/script_badge/background.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// 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.
-
-chrome.test.notifyPass();
diff --git a/chrome/test/data/extensions/api_test/keybinding/script_badge/manifest.json b/chrome/test/data/extensions/api_test/keybinding/script_badge/manifest.json
deleted file mode 100644
index e3431b9..0000000
--- a/chrome/test/data/extensions/api_test/keybinding/script_badge/manifest.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "A extension command test for script badges",
- "version": "1.0",
- "manifest_version": 2,
- "background": {
- "scripts": ["background.js"]
- },
- "commands": {
- "_execute_script_badge": {
- "suggested_key": "Ctrl+Shift+F"
- }
- },
- "permissions": [
- "tabs", "http://*/*"
- ],
- "script_badge": {
- "default_popup": "popup.html"
- }
-}
diff --git a/chrome/test/data/extensions/api_test/keybinding/script_badge/popup.html b/chrome/test/data/extensions/api_test/keybinding/script_badge/popup.html
deleted file mode 100644
index 9a11fb3..0000000
--- a/chrome/test/data/extensions/api_test/keybinding/script_badge/popup.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
- * 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.
--->
-<html>
-<head>
-<script src="popup.js"></script>
-</head>
-</html>
diff --git a/chrome/test/data/extensions/api_test/keybinding/script_badge/popup.js b/chrome/test/data/extensions/api_test/keybinding/script_badge/popup.js
deleted file mode 100644
index 54c01cf..0000000
--- a/chrome/test/data/extensions/api_test/keybinding/script_badge/popup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// 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.
-
-chrome.test.notifyPass();
diff --git a/chrome/test/data/extensions/api_test/keybinding/script_badge/show.html b/chrome/test/data/extensions/api_test/keybinding/script_badge/show.html
deleted file mode 100644
index b8f402f..0000000
--- a/chrome/test/data/extensions/api_test/keybinding/script_badge/show.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
- * 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.
--->
-<html>
-<head>
-<script src="show.js"></script>
-</head>
-</html>
diff --git a/chrome/test/data/extensions/api_test/keybinding/script_badge/show.js b/chrome/test/data/extensions/api_test/keybinding/script_badge/show.js
deleted file mode 100644
index 51659d3..0000000
--- a/chrome/test/data/extensions/api_test/keybinding/script_badge/show.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.
-
-// Show the script badge now.
-chrome.tabs.getSelected(null, function(tab) {
- chrome.scriptBadge.getAttention({ "tabId": tab.id });
- chrome.test.notifyPass();
-});
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index 2711bad..40b7d4e 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -127,7 +127,6 @@ const char kRequirements[] = "requirements";
const char kRunAt[] = "run_at";
const char kSandboxedPages[] = "sandbox.pages";
const char kSandboxedPagesCSP[] = "sandbox.content_security_policy";
-const char kScriptBadge[] = "script_badge";
const char kSettingsOverride[] = "chrome_settings_overrides";
const char kSettingsOverrideAlternateUrls[] =
"chrome_settings_overrides.search_provider.alternate_urls";
@@ -225,7 +224,6 @@ const char kRunAtDocumentIdle[] = "document_idle";
const char kPageActionCommandEvent[] = "_execute_page_action";
const char kPageActionTypeTab[] = "tab";
const char kPageActionTypePermanent[] = "permanent";
-const char kScriptBadgeCommandEvent[] = "_execute_script_badge";
const char kLaunchContainerPanel[] = "panel";
const char kLaunchContainerTab[] = "tab";
const char kLaunchContainerWindow[] = "window";
@@ -544,8 +542,6 @@ const char kInvalidSandboxedPage[] =
"Invalid value for 'sandbox.pages[*]'.";
const char kInvalidSandboxedPagesCSP[] =
"Invalid value for 'sandbox.content_security_policy'.";
-const char kInvalidScriptBadge[] =
- "Invalid value for 'script_badge'.";
const char kInvalidSearchEngineMissingKeys[] =
"Missing mandatory parameters for "
"'chrome_settings_overrides.search_provider'.";
@@ -686,14 +682,6 @@ const char kPermissionUnknownOrMalformed[] =
"Permission '*' is unknown or URL pattern is malformed.";
const char kReservedMessageFound[] =
"Reserved key * found in message catalog.";
-const char kScriptBadgeRequiresFlag[] =
- "The script_badge manifest key is turned off by default. "
- "You can enable it with the --enable-script-badges command-line flag.";
-const char kScriptBadgeIconIgnored[] =
- "default_icon specified in script_badge manifest section will not be used.";
-const char kScriptBadgeTitleIgnored[] =
- "default_title specified in script_badge manifest section will not be "
- "used.";
const char kUnrecognizedManifestKey[] = "Unrecognized manifest key '*'.";
const char kUnrecognizedManifestProperty[] =
"Unrecognized property '*' of manifest key '*'.";
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index 36505dd..d395033 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -129,7 +129,6 @@ extern const char kRequirements[];
extern const char kRunAt[];
extern const char kSandboxedPages[];
extern const char kSandboxedPagesCSP[];
-extern const char kScriptBadge[];
extern const char kSettingsOverride[];
extern const char kSettingsOverrideAlternateUrls[];
extern const char kShiftKey[];
@@ -227,7 +226,6 @@ extern const char kLaunchContainerWindow[];
extern const char kPageActionCommandEvent[];
extern const char kPageActionTypePermanent[];
extern const char kPageActionTypeTab[];
-extern const char kScriptBadgeCommandEvent[];
extern const char kRunAtDocumentEnd[];
extern const char kRunAtDocumentIdle[];
extern const char kRunAtDocumentStart[];
@@ -393,7 +391,6 @@ extern const char kInvalidRunAt[];
extern const char kInvalidSandboxedPagesList[];
extern const char kInvalidSandboxedPage[];
extern const char kInvalidSandboxedPagesCSP[];
-extern const char kInvalidScriptBadge[];
extern const char kInvalidSearchEngineMissingKeys[];
extern const char kInvalidSearchEngineURL[];
extern const char kInvalidShortName[];
@@ -462,9 +459,6 @@ extern const char kPermissionUnknownOrMalformed[];
extern const char kReservedMessageFound[];
extern const char kUnrecognizedManifestKey[];
extern const char kUnrecognizedManifestProperty[];
-extern const char kScriptBadgeRequiresFlag[];
-extern const char kScriptBadgeIconIgnored[];
-extern const char kScriptBadgeTitleIgnored[];
extern const char kWebRequestConflictsWithLazyBackground[];
#if defined(OS_CHROMEOS)
extern const char kIllegalPlugins[];