| Index: chrome/browser/background/background_contents_service.cc
|
| ===================================================================
|
| --- chrome/browser/background/background_contents_service.cc (revision 113069)
|
| +++ chrome/browser/background/background_contents_service.cc (working copy)
|
| @@ -418,9 +418,9 @@
|
|
|
| void BackgroundContentsService::LoadBackgroundContentsFromManifests(
|
| Profile* profile) {
|
| - const ExtensionSet* extensions =
|
| + const ExtensionList* extensions =
|
| profile->GetExtensionService()->extensions();
|
| - ExtensionSet::const_iterator iter = extensions->begin();
|
| + ExtensionList::const_iterator iter = extensions->begin();
|
| for (; iter != extensions->end(); ++iter) {
|
| const Extension* extension = *iter;
|
| if (extension->is_hosted_app() &&
|
|
|
| Property changes on: chrome/browser/background/background_contents_service.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|