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

Unified Diff: chrome/browser/automation/automation_provider_observers.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: Move ExtensionSet to extensions namespace 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/automation/automation_provider_observers.cc
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 6ddf2135293f1163569b66821b243af2a2deb80d..aa619869333423d2c964c458d2a4c5aefef5ed13 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -1748,11 +1748,11 @@ namespace {
// as identified from a given list of extensions. The caller takes ownership
// of the created vector.
std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
- const ExtensionSet* extensions,
+ const extensions::ExtensionSet* extensions,
ExtensionService* ext_service) {
std::vector<DictionaryValue*>* apps_list =
new std::vector<DictionaryValue*>();
- for (ExtensionSet::const_iterator ext = extensions->begin();
+ for (extensions::ExtensionSet::const_iterator ext = extensions->begin();
ext != extensions->end(); ++ext) {
// Only return information about extensions that are actually apps.
if ((*ext)->is_app()) {
@@ -1819,7 +1819,7 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation,
}
// Process enabled extensions.
ListValue* apps_list = new ListValue();
- const ExtensionSet* extensions = ext_service->extensions();
+ const extensions::ExtensionSet* extensions = ext_service->extensions();
std::vector<DictionaryValue*>* enabled_apps = GetAppInfoFromExtensions(
extensions, ext_service);
for (std::vector<DictionaryValue*>::const_iterator app =
@@ -1829,7 +1829,8 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation,
}
delete enabled_apps;
// Process disabled extensions.
- const ExtensionSet* disabled_extensions = ext_service->disabled_extensions();
+ const extensions::ExtensionSet* disabled_extensions =
+ ext_service->disabled_extensions();
std::vector<DictionaryValue*>* disabled_apps = GetAppInfoFromExtensions(
disabled_extensions, ext_service);
for (std::vector<DictionaryValue*>::const_iterator app =
@@ -1839,7 +1840,7 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation,
}
delete disabled_apps;
// Process terminated extensions.
- const ExtensionSet* terminated_extensions =
+ const extensions::ExtensionSet* terminated_extensions =
ext_service->terminated_extensions();
std::vector<DictionaryValue*>* terminated_apps = GetAppInfoFromExtensions(
terminated_extensions, ext_service);

Powered by Google App Engine
This is Rietveld 408576698