summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_service.cc
diff options
context:
space:
mode:
authorjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 16:03:38 +0000
committerjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 16:03:38 +0000
commit18cc5a578b6bc5eca8854cf6da68ff9878975d8b (patch)
treefaba06827e3621ca1f915c7442452ff6b4b94c92 /chrome/browser/extensions/extension_service.cc
parentb5d20c2e5f1ccf983bc49259b553f3acd9d1c18a (diff)
downloadchromium_src-18cc5a578b6bc5eca8854cf6da68ff9878975d8b.zip
chromium_src-18cc5a578b6bc5eca8854cf6da68ff9878975d8b.tar.gz
chromium_src-18cc5a578b6bc5eca8854cf6da68ff9878975d8b.tar.bz2
Update the web store promo to be clearer and configurable at run-time.
The promo now behaves like this: a) Promo is fetched 5 seconds after first launch. b) Promo is shown whenever no apps are installed, or if only default apps are installed (from old Chrome versions). c) Clicking "hide this" puts the apps section into menu mode. d) Switching locales will fetch a new promo in that locale. e) We no longer install default apps, but they'll expire and be uninstalled the same as before. BUG=78358 TEST=PromoResourceServiceTest, ExtensionAppsPromo Review URL: http://codereview.chromium.org/6825052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.cc')
-rw-r--r--chrome/browser/extensions/extension_service.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 78c3ff0..8bf7764 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -24,7 +24,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/debugger/devtools_manager.h"
#include "chrome/browser/extensions/crx_installer.h"
-#include "chrome/browser/extensions/default_apps.h"
+#include "chrome/browser/extensions/apps_promo.h"
#include "chrome/browser/extensions/extension_accessibility_api.h"
#include "chrome/browser/extensions/extension_bookmarks_module.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
@@ -410,8 +410,7 @@ ExtensionService::ExtensionService(Profile* profile,
show_extensions_prompts_(true),
ready_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)),
- default_apps_(profile->GetPrefs(),
- g_browser_process->GetApplicationLocale()),
+ apps_promo_(profile->GetPrefs()),
event_routers_initialized_(false) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -1671,12 +1670,6 @@ void ExtensionService::OnExtensionInstalled(const Extension* extension) {
Details<const Extension>(extension));
}
- if (extension->is_app()) {
- ExtensionIdSet installed_ids = GetAppIds();
- installed_ids.insert(id);
- default_apps_.DidInstallApp(installed_ids);
- }
-
// Transfer ownership of |extension| to AddExtension.
AddExtension(scoped_extension);
}