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

Unified Diff: apps/app_restore_service.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
« no previous file with comments | « apps/DEPS ('k') | chrome/browser/apps/app_url_redirector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/app_restore_service.cc
diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc
index 50cb7d0396fa223702ca986f545420ecab3ccfd4..75cf195ee0c3bd864fab3bddc6c6b8a23e14b00c 100644
--- a/apps/app_restore_service.cc
+++ b/apps/app_restore_service.cc
@@ -16,8 +16,8 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_set.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#if defined(OS_WIN)
#include "win8/util/win8_util.h"
@@ -52,10 +52,10 @@ AppRestoreService::AppRestoreService(Profile* profile)
void AppRestoreService::HandleStartup(bool should_restore_apps) {
ExtensionService* extension_service =
ExtensionSystem::Get(profile_)->extension_service();
- const ExtensionSet* extensions = extension_service->extensions();
+ const extensions::ExtensionSet* extensions = extension_service->extensions();
ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
- for (ExtensionSet::const_iterator it = extensions->begin();
+ for (extensions::ExtensionSet::const_iterator it = extensions->begin();
it != extensions->end(); ++it) {
const Extension* extension = it->get();
if (extension_prefs->IsExtensionRunning(extension->id())) {
« no previous file with comments | « apps/DEPS ('k') | chrome/browser/apps/app_url_redirector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698