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 /chrome/browser/profile_resetter | |
| 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 'chrome/browser/profile_resetter')
| -rw-r--r-- | chrome/browser/profile_resetter/resettable_settings_snapshot.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc index 2786b35..cd4eef2 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc @@ -17,6 +17,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" #include "ui/base/l10n/l10n_util.h" @@ -66,10 +67,10 @@ ResettableSettingsSnapshot::ResettableSettingsSnapshot(Profile* profile) ExtensionService* extension_service = profile->GetExtensionService(); DCHECK(extension_service); - const ExtensionSet* enabled_ext = extension_service->extensions(); + const extensions::ExtensionSet* enabled_ext = extension_service->extensions(); enabled_extensions_.reserve(enabled_ext->size()); - for (ExtensionSet::const_iterator it = enabled_ext->begin(); + for (extensions::ExtensionSet::const_iterator it = enabled_ext->begin(); it != enabled_ext->end(); ++it) enabled_extensions_.push_back(std::make_pair((*it)->id(), (*it)->name())); |