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

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

Issue 7988003: Fix cros build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/external_extension_provider_impl.h" 5 #include "chrome/browser/extensions/external_extension_provider_impl.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/linked_ptr.h" 9 #include "base/memory/linked_ptr.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 Extension::EXTERNAL_PREF_DOWNLOAD))); 255 Extension::EXTERNAL_PREF_DOWNLOAD)));
256 #endif 256 #endif
257 257
258 #if defined(OS_CHROMEOS) 258 #if defined(OS_CHROMEOS)
259 // Chrome OS specific source for OEM customization. 259 // Chrome OS specific source for OEM customization.
260 provider_list->push_back( 260 provider_list->push_back(
261 linked_ptr<ExternalExtensionProviderInterface>( 261 linked_ptr<ExternalExtensionProviderInterface>(
262 new ExternalExtensionProviderImpl( 262 new ExternalExtensionProviderImpl(
263 service, 263 service,
264 new ExternalPrefExtensionLoader( 264 new ExternalPrefExtensionLoader(
265 chrome::DIR_USER_EXTERNAL_EXTENSIONS), 265 chrome::DIR_USER_EXTERNAL_EXTENSIONS,
266 ExternalPrefExtensionLoader::NONE),
266 Extension::EXTERNAL_PREF, 267 Extension::EXTERNAL_PREF,
267 Extension::EXTERNAL_PREF_DOWNLOAD))); 268 Extension::EXTERNAL_PREF_DOWNLOAD)));
268 #endif 269 #endif
269 #if defined(OS_WIN) 270 #if defined(OS_WIN)
270 provider_list->push_back( 271 provider_list->push_back(
271 linked_ptr<ExternalExtensionProviderInterface>( 272 linked_ptr<ExternalExtensionProviderInterface>(
272 new ExternalExtensionProviderImpl( 273 new ExternalExtensionProviderImpl(
273 service, 274 service,
274 new ExternalRegistryExtensionLoader, 275 new ExternalRegistryExtensionLoader,
275 Extension::EXTERNAL_REGISTRY, 276 Extension::EXTERNAL_REGISTRY,
276 Extension::INVALID))); 277 Extension::INVALID)));
277 #endif 278 #endif
278 provider_list->push_back( 279 provider_list->push_back(
279 linked_ptr<ExternalExtensionProviderInterface>( 280 linked_ptr<ExternalExtensionProviderInterface>(
280 new ExternalExtensionProviderImpl( 281 new ExternalExtensionProviderImpl(
281 service, 282 service,
282 new ExternalPolicyExtensionLoader(profile), 283 new ExternalPolicyExtensionLoader(profile),
283 Extension::INVALID, 284 Extension::INVALID,
284 Extension::EXTERNAL_POLICY_DOWNLOAD))); 285 Extension::EXTERNAL_POLICY_DOWNLOAD)));
285 } 286 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698