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

Unified Diff: chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 527dd71a90b44dfadefc8bb4b91de3e29c259a71..3844420bed2112b6596be0109e9e9597bdb5c9dd 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -140,6 +140,7 @@
#include "extensions/browser/process_manager.h"
#include "extensions/browser/view_type_utils.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "extensions/common/manifest_handlers/background_info.h"
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
@@ -3535,8 +3536,9 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
}
scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
ListValue* extensions_values = new ListValue;
- const ExtensionSet* extensions = service->extensions();
- const ExtensionSet* disabled_extensions = service->disabled_extensions();
+ const extensions::ExtensionSet* extensions = service->extensions();
+ const extensions::ExtensionSet* disabled_extensions =
+ service->disabled_extensions();
ExtensionList all;
all.insert(all.end(),
extensions->begin(),

Powered by Google App Engine
This is Rietveld 408576698