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

Side by Side Diff: chrome/browser/extensions/default_apps.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/default_apps.h" 5 #include "chrome/browser/extensions/default_apps.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #if !defined(OS_ANDROID) 9 #if !defined(OS_ANDROID)
10 #include "chrome/browser/first_run/first_run.h" 10 #include "chrome/browser/first_run/first_run.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 kNeverInstallDefaultApps); 125 kNeverInstallDefaultApps);
126 } 126 }
127 } 127 }
128 128
129 return install_apps; 129 return install_apps;
130 } 130 }
131 131
132 Provider::Provider(Profile* profile, 132 Provider::Provider(Profile* profile,
133 VisitorInterface* service, 133 VisitorInterface* service,
134 extensions::ExternalLoader* loader, 134 extensions::ExternalLoader* loader,
135 extensions::Extension::Location crx_location, 135 extensions::Manifest::Location crx_location,
136 extensions::Extension::Location download_location, 136 extensions::Manifest::Location download_location,
137 int creation_flags) 137 int creation_flags)
138 : extensions::ExternalProviderImpl(service, loader, crx_location, 138 : extensions::ExternalProviderImpl(service, loader, crx_location,
139 download_location, creation_flags), 139 download_location, creation_flags),
140 profile_(profile), 140 profile_(profile),
141 is_migration_(false) { 141 is_migration_(false) {
142 DCHECK(profile); 142 DCHECK(profile);
143 set_auto_acknowledge(true); 143 set_auto_acknowledge(true);
144 } 144 }
145 145
146 void Provider::VisitRegisteredExtension() { 146 void Provider::VisitRegisteredExtension() {
(...skipping 19 matching lines...) Expand all
166 for (std::set<std::string>::iterator it = new_default_apps.begin(); 166 for (std::set<std::string>::iterator it = new_default_apps.begin();
167 it != new_default_apps.end(); ++it) { 167 it != new_default_apps.end(); ++it) {
168 prefs->Remove(*it, NULL); 168 prefs->Remove(*it, NULL);
169 } 169 }
170 } 170 }
171 171
172 ExternalProviderImpl::SetPrefs(prefs); 172 ExternalProviderImpl::SetPrefs(prefs);
173 } 173 }
174 174
175 } // namespace default_apps 175 } // namespace default_apps
OLDNEW
« no previous file with comments | « chrome/browser/extensions/default_apps.h ('k') | chrome/browser/extensions/default_apps_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698