Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3857)

Unified Diff: chrome/browser/apps/shortcut_manager.cc

Issue 298253002: cleanup: Remove NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED from c/b/apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/apps/shortcut_manager.cc
diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc
index 2e5221a4471cb009e326bd06480383a39715113b..efb54cc251d471f2688e9420dcbd26118fc5b546 100644
--- a/chrome/browser/apps/shortcut_manager.cc
+++ b/chrome/browser/apps/shortcut_manager.cc
@@ -25,6 +25,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_set.h"
@@ -64,18 +65,16 @@ void AppShortcutManager::RegisterProfilePrefs(
AppShortcutManager::AppShortcutManager(Profile* profile)
: profile_(profile),
is_profile_info_cache_observer_(false),
- prefs_(profile->GetPrefs()) {
+ prefs_(profile->GetPrefs()),
+ extension_registry_observer_(this) {
// Use of g_browser_process requires that we are either on the UI thread, or
// there are no threads initialized (such as in unit tests).
DCHECK(!content::BrowserThread::IsThreadInitialized(
content::BrowserThread::UI) ||
content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
- registrar_.Add(this,
- chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
- content::Source<Profile>(profile_));
- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
- content::Source<Profile>(profile_));
+ extension_registry_observer_.Add(
+ extensions::ExtensionRegistry::Get(profile_));
// Wait for extensions to be ready before running OnceOffCreateShortcuts.
registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
not at google - send to devlin 2014/05/27 17:40:16 Incidentally you should be able to get rid of this
limasdf 2014/05/27 17:54:07 Thank you for let me know that. :) I'll do it in s
content::Source<Profile>(profile_));
@@ -100,38 +99,32 @@ AppShortcutManager::~AppShortcutManager() {
void AppShortcutManager::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
- switch (type) {
- case chrome::NOTIFICATION_EXTENSIONS_READY: {
- OnceOffCreateShortcuts();
- break;
- }
- case chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED: {
- const extensions::InstalledExtensionInfo* installed_info =
- content::Details<const extensions::InstalledExtensionInfo>(details)
- .ptr();
- const Extension* extension = installed_info->extension;
- // If the app is being updated, update any existing shortcuts but do not
- // create new ones. If it is being installed, automatically create a
- // shortcut in the applications menu (e.g., Start Menu).
- if (installed_info->is_update) {
- web_app::UpdateAllShortcuts(
- base::UTF8ToUTF16(installed_info->old_name), profile_, extension);
- } else if (ShouldCreateShortcutFor(profile_, extension)) {
- CreateShortcutsInApplicationsMenu(profile_, extension);
- }
- break;
- }
- case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
- const Extension* extension = content::Details<const Extension>(
- details).ptr();
- web_app::DeleteAllShortcuts(profile_, extension);
- break;
- }
- default:
- NOTREACHED();
+ DCHECK_EQ(chrome::NOTIFICATION_EXTENSIONS_READY, type);
+ OnceOffCreateShortcuts();
+}
+
+void AppShortcutManager::OnExtensionWillBeInstalled(
+ content::BrowserContext* browser_context,
+ const Extension* extension,
+ bool is_update,
+ const std::string& old_name) {
+ // If the app is being updated, update any existing shortcuts but do not
+ // create new ones. If it is being installed, automatically create a
+ // shortcut in the applications menu (e.g., Start Menu).
+ if (is_update) {
+ web_app::UpdateAllShortcuts(
+ base::UTF8ToUTF16(old_name), profile_, extension);
+ } else if (ShouldCreateShortcutFor(profile_, extension)) {
+ CreateShortcutsInApplicationsMenu(profile_, extension);
}
}
+void AppShortcutManager::OnExtensionUninstalled(
+ content::BrowserContext* browser_context,
+ const Extension* extension) {
+ web_app::DeleteAllShortcuts(profile_, extension);
+}
+
void AppShortcutManager::OnProfileWillBeRemoved(
const base::FilePath& profile_path) {
if (profile_path != profile_->GetPath())
« chrome/browser/apps/ephemeral_app_service.cc ('K') | « chrome/browser/apps/shortcut_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698