| Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
| index b2e58cc68e57acd068b9df50608a1207772e4758..b5c95a24fe4b53b1539b5fe5577cdece558e33fa 100644
|
| --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
| +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
| @@ -254,7 +254,7 @@ void AppLauncherHandler::Observe(int type,
|
| return;
|
|
|
| switch (type) {
|
| - case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
|
| + case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
|
| const Extension* extension =
|
| content::Details<const Extension>(details).ptr();
|
| if (!extension->is_app())
|
| @@ -280,11 +280,11 @@ void AppLauncherHandler::Observe(int type,
|
|
|
| break;
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
|
| - case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: {
|
| + case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
|
| + case extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: {
|
| const Extension* extension = NULL;
|
| bool uninstalled = false;
|
| - if (type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED) {
|
| + if (type == extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED) {
|
| extension = content::Details<const Extension>(details).ptr();
|
| uninstalled = true;
|
| } else { // NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED
|
| @@ -319,7 +319,7 @@ void AppLauncherHandler::Observe(int type,
|
| }
|
| break;
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED: {
|
| + case chrome::NOTIFICATION_APP_LAUNCHER_REORDERED: {
|
| const std::string* id =
|
| content::Details<const std::string>(details).ptr();
|
| if (id) {
|
| @@ -340,7 +340,7 @@ void AppLauncherHandler::Observe(int type,
|
| }
|
| break;
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR: {
|
| + case extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR: {
|
| CrxInstaller* crx_installer = content::Source<CrxInstaller>(source).ptr();
|
| if (!Profile::FromWebUI(web_ui())->IsSameProfile(
|
| crx_installer->profile())) {
|
| @@ -348,7 +348,7 @@ void AppLauncherHandler::Observe(int type,
|
| }
|
| // Fall through.
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_LOAD_ERROR: {
|
| + case extensions::NOTIFICATION_EXTENSION_LOAD_ERROR: {
|
| attempted_bookmark_app_install_ = false;
|
| break;
|
| }
|
| @@ -456,21 +456,24 @@ void AppLauncherHandler::HandleGetApps(const base::ListValue* args) {
|
| extension_pref_change_registrar_.Add(prefs::kNtpAppPageNames, callback);
|
|
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| + extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| content::Source<Profile>(profile));
|
| - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| - content::Source<Profile>(profile));
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
|
| + extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| content::Source<Profile>(profile));
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
|
| + extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
|
| + content::Source<Profile>(profile));
|
| + registrar_.Add(this,
|
| + chrome::NOTIFICATION_APP_LAUNCHER_REORDERED,
|
| content::Source<AppSorting>(
|
| ExtensionPrefs::Get(profile)->app_sorting()));
|
| - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
|
| - content::Source<CrxInstaller>(NULL));
|
| - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOAD_ERROR,
|
| - content::Source<Profile>(profile));
|
| + registrar_.Add(this,
|
| + extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR,
|
| + content::Source<CrxInstaller>(NULL));
|
| + registrar_.Add(this,
|
| + extensions::NOTIFICATION_EXTENSION_LOAD_ERROR,
|
| + content::Source<Profile>(profile));
|
| }
|
|
|
| has_loaded_apps_ = true;
|
|
|