diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 03:26:57 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 03:26:57 +0000 |
| commit | 289c44bbf904e0339b8e4b0d8ed5456593a135e5 (patch) | |
| tree | 2fae601f2a44ade6701c4e1a233e734579606f59 /apps | |
| parent | 3184a8e64ddcf24c694e8bd57dad40d4011991f1 (diff) | |
| download | chromium_src-289c44bbf904e0339b8e4b0d8ed5456593a135e5.zip chromium_src-289c44bbf904e0339b8e4b0d8ed5456593a135e5.tar.gz chromium_src-289c44bbf904e0339b8e4b0d8ed5456593a135e5.tar.bz2 | |
Move c/c/e/extension_set to top-level extensions/
Move extension_set.h/cc and extension_set_unittest to extensions/common/.
Remove unused includes.
Add includes where transitive includes were used.
Update DEPS.
No functional changes.
BUG=162530
TBR=sky@chromium.org (c/b/autocomplete, c/b/ui, c/test)
TBR=jam@chromium.org (c/b/automation)
TBR=atwilson@chromium.org (c/b/background, c/b/sync, c/b/policy)
TBR=bauerb@chromium.org (c/b/browsing_data, c/b/content_settings, c/b/managed_mode)
TBR=satorux@chromium.org (c/b/chromeos)
TBR=yurys@chromium.org (c/b/devtools)
TBR=thestig@chromium.org (c/b/media_galleries)
TBR=stevenjb@chromium.org (c/b/notifications)
TBR=battre@chromium.org (c/b/profile_resetter)
TBR=dmazzoni@chromium.org (c/b/speech)
TBR=kinuko@chromium.org (c/b/sync_file_system)
TBR=pkotwicz@chromium.org (c/b/themes)
Review URL: https://codereview.chromium.org/102103005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/DEPS | 1 | ||||
| -rw-r--r-- | apps/app_restore_service.cc | 6 |
2 files changed, 3 insertions, 4 deletions
@@ -44,7 +44,6 @@ include_rules = [ "+chrome/common/extensions/api/app_runtime.h", "+chrome/common/extensions/api/app_window.h", "+chrome/common/extensions/extension_messages.h", - "+chrome/common/extensions/extension_set.h", "+chrome/common/extensions/manifest_handlers/icons_handler.h", ] diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc index 50cb7d0..75cf195 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())) { |