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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years 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/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 e35efcac370b2b411939d1fc9d22c655335afe9d..06599e8ca32dfb6b91243757cfcd1e6229cc06f7 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -51,6 +51,7 @@
#include "extensions/browser/management_policy.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "grit/browser_resources.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -425,20 +426,21 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) {
// The first time we load the apps we must add all current app to the list
// of apps visible on the NTP.
if (!has_loaded_apps_) {
- const ExtensionSet* extensions = extension_service_->extensions();
- for (ExtensionSet::const_iterator it = extensions->begin();
+ const extensions::ExtensionSet* extensions =
+ extension_service_->extensions();
+ for (extensions::ExtensionSet::const_iterator it = extensions->begin();
it != extensions->end(); ++it) {
visible_apps_.insert((*it)->id());
}
extensions = extension_service_->disabled_extensions();
- for (ExtensionSet::const_iterator it = extensions->begin();
+ for (extensions::ExtensionSet::const_iterator it = extensions->begin();
it != extensions->end(); ++it) {
visible_apps_.insert((*it)->id());
}
extensions = extension_service_->terminated_extensions();
- for (ExtensionSet::const_iterator it = extensions->begin();
+ for (extensions::ExtensionSet::const_iterator it = extensions->begin();
it != extensions->end(); ++it) {
visible_apps_.insert((*it)->id());
}
« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698