summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 04:07:55 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 04:07:55 +0000
commit26f16b508c8f1d44ca12a95dfcc25193c700f6c3 (patch)
tree0aec165200e0ed356ad5560fa64d8debc4a2edd4 /chrome/browser/dom_ui
parentd78ef705947b6f3bb52aa10cdf3ed21b579bf507 (diff)
downloadchromium_src-26f16b508c8f1d44ca12a95dfcc25193c700f6c3.zip
chromium_src-26f16b508c8f1d44ca12a95dfcc25193c700f6c3.tar.gz
chromium_src-26f16b508c8f1d44ca12a95dfcc25193c700f6c3.tar.bz2
Only allow installation of extensions/apps with gallery update url via download from gallery
BUG=45542 TEST=NONE Review URL: http://codereview.chromium.org/2855009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/app_launcher_handler.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index 31384cb..12c23c2 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/dom_ui/app_launcher_handler.h"
#include "app/animation.h"
+#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/base64.h"
#include "base/utf_string_conversions.h"
@@ -16,12 +17,14 @@
#include "chrome/browser/platform_util.h"
#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_resource.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
#include "chrome/common/url_constants.h"
#include "gfx/rect.h"
#include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
namespace {
@@ -95,20 +98,15 @@ void AppLauncherHandler::CreateAppInfo(Extension* extension,
}
void AppLauncherHandler::HandleGetApps(const Value* value) {
- std::string gallery_title;
- std::string gallery_url;
-
- // TODO(aa): Decide the final values for these and remove the switches.
- gallery_title = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kAppsGalleryTitle);
- gallery_url = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kAppsGalleryURL);
+ std::string gallery_title =
+ l10n_util::GetStringUTF8(IDS_EXTENSION_WEB_STORE_TITLE);
+
bool show_debug_link = CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAppsDebug);
DictionaryValue dictionary;
dictionary.SetString(L"galleryTitle", gallery_title);
- dictionary.SetString(L"galleryURL", gallery_url);
+ dictionary.SetString(L"galleryURL", Extension::ChromeStoreURL());
dictionary.SetBoolean(L"showDebugLink", show_debug_link);
ListValue* list = new ListValue();