summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_resources.grd1
-rw-r--r--chrome/browser/dom_ui/app_launcher_handler.cc13
-rw-r--r--chrome/browser/extensions/extensions_service.cc15
-rw-r--r--chrome/browser/profile_impl.cc4
-rw-r--r--chrome/browser/resources/webstore_app/manifest.json20
-rw-r--r--chrome/common/extensions/extension.h5
-rw-r--r--chrome/common/extensions/extension_constants.cc1
-rw-r--r--chrome/common/extensions/extension_constants.h3
8 files changed, 6 insertions, 56 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 648ba2b..24b9baf 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -62,7 +62,6 @@ without changes to the corresponding grd file. eadeae-->
<include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
<include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_invalid.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
<if expr="pp_ifdef('chromeos')">
<include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index d05ebf7..825be90 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
@@ -110,13 +109,11 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) {
const ExtensionList* extensions = extensions_service_->extensions();
for (ExtensionList::const_iterator it = extensions->begin();
it != extensions->end(); ++it) {
- // Don't include the WebStore component app. The WebStore launcher
- // gets special treatment in ntp/apps.js.
- if ((*it)->is_app() && (*it)->id() != extension_misc::kWebStoreAppId) {
- DictionaryValue* app_info = new DictionaryValue();
- CreateAppInfo(*it, app_info);
- list->Append(app_info);
- }
+ if ((*it)->is_app()) {
+ DictionaryValue* app_info = new DictionaryValue();
+ CreateAppInfo(*it, app_info);
+ list->Append(app_info);
+ }
}
dictionary.Set("apps", list);
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 3fb4a91..169f15f 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -530,21 +530,6 @@ void ExtensionsService::LoadComponentExtensions() {
return;
}
- // In order for the --apps-gallery-url switch to work with the gallery
- // process isolation, we must insert any provided value into the component
- // app's launch url and web extent.
- if (extension->id() == extension_misc::kWebStoreAppId ) {
- GURL gallery_url(CommandLine::ForCurrentProcess()
- ->GetSwitchValueASCII(switches::kAppsGalleryURL));
- if (gallery_url.is_valid()) {
- extension->set_launch_web_url(gallery_url.spec());
- URLPattern pattern(URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS);
- pattern.Parse(gallery_url.spec());
- pattern.set_path(pattern.path() + '*');
- extension->web_extent().AddPattern(pattern);
- }
- }
-
OnExtensionLoaded(extension.release(), false); // Don't allow privilege
// increase.
}
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index 677cf69..64027a1 100644
--- a/chrome/browser/profile_impl.cc
+++ b/chrome/browser/profile_impl.cc
@@ -391,10 +391,6 @@ void ProfileImpl::InitExtensions() {
component_extensions.push_back(
std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
- // Web Store.
- component_extensions.push_back(
- std::make_pair("web_store", IDR_WEBSTORE_MANIFEST));
-
// Some sample apps to make our lives easier while we are developing extension
// apps. This way we don't have to constantly install these over and over.
if (Extension::AppsAreEnabled() && IncludeDefaultApps()) {
diff --git a/chrome/browser/resources/webstore_app/manifest.json b/chrome/browser/resources/webstore_app/manifest.json
deleted file mode 100644
index 0b94ace..0000000
--- a/chrome/browser/resources/webstore_app/manifest.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtl3tO0osjuzRsf6xtD2SKxPlTfuoy7AWoObysitBPvH5fE1NaAA1/2JkPWkVDhdLBWLaIBPYeXbzlHp3y4Vv/4XG+aN5qFE3z+1RU/NqkzVYHtIpVScf3DjTYtKVL66mzVGijSoAIwbFCC3LpGdaoe6Q1rSRDp76wR6jjFzsYwQIDAQAB",
- "name": "Chrome Web Store",
- "version": "0.1",
- "description": "Web Store",
- "icons": {
- },
- "app": {
- "launch": {
- "web_url": "https://chrome.google.com/extensions"
- },
- "urls": [
- "https://chrome.google.com/extensions",
- "https://clients2.google.com/service/update2",
- "https://clients2.googleusercontent.com/crx"
- ]
- },
- "permissions": [
- ]
-}
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 5d993cfc..9c51d1a 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -346,13 +346,10 @@ class Extension {
const std::string omnibox_keyword() const { return omnibox_keyword_; }
bool is_app() const { return is_app_; }
- ExtensionExtent& web_extent() { return web_extent_; }
+ const ExtensionExtent& web_extent() const { return web_extent_; }
const ExtensionExtent& browse_extent() const { return browse_extent_; }
const std::string& launch_local_path() const { return launch_local_path_; }
const std::string& launch_web_url() const { return launch_web_url_; }
- void set_launch_web_url(const std::string& launch_web_url) {
- launch_web_url_ = launch_web_url;
- }
LaunchContainer launch_container() const { return launch_container_; }
bool launch_fullscreen() const { return launch_fullscreen_; }
int launch_width() const { return launch_width_; }
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 313b84c..7467185 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -299,5 +299,4 @@ const char* kDecodedMessageCatalogsFilename = "DECODED_MESSAGE_CATALOGS";
namespace extension_misc {
const char* kBookmarkManagerId = "eemcgdkfndhakfknompkggombfjjjeno";
-const char* kWebStoreAppId = "ahfgeienlihckogmohjhadlkjgocpleb";
}
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index 9bd5e1e..b95887f 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -212,9 +212,6 @@ namespace extension_misc {
// The extension id of the bookmark manager.
extern const char* kBookmarkManagerId;
-
- // The extension id of the Web Store component application.
- extern const char* kWebStoreAppId;
} // extension_misc
#endif // CHROME_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_
generated by cgit v1.1 at 2025-01-21 01:28:28 +0000