OLD | NEW |
---|---|
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/external_extension_provider_impl.h" | 5 #include "chrome/browser/extensions/external_extension_provider_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/linked_ptr.h" | 10 #include "base/memory/linked_ptr.h" |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
308 | 308 |
309 provider_list->push_back( | 309 provider_list->push_back( |
310 linked_ptr<ExternalExtensionProviderInterface>( | 310 linked_ptr<ExternalExtensionProviderInterface>( |
311 new ExternalExtensionProviderImpl( | 311 new ExternalExtensionProviderImpl( |
312 service, | 312 service, |
313 new ExternalPrefExtensionLoader( | 313 new ExternalPrefExtensionLoader( |
314 chrome::DIR_EXTERNAL_EXTENSIONS, | 314 chrome::DIR_EXTERNAL_EXTENSIONS, |
315 check_admin_permissions_on_mac), | 315 check_admin_permissions_on_mac), |
316 Extension::EXTERNAL_PREF, | 316 Extension::EXTERNAL_PREF, |
317 Extension::EXTERNAL_PREF_DOWNLOAD, | 317 Extension::EXTERNAL_PREF_DOWNLOAD, |
318 #if defined(OS_CHROMEOS) | |
319 Extension::FROM_WEBSTORE))); | |
320 #else | |
318 Extension::NO_FLAGS))); | 321 Extension::NO_FLAGS))); |
322 #endif | |
319 | 323 |
320 #if defined(OS_CHROMEOS) | 324 #if defined(OS_CHROMEOS) |
321 // Define a per-user source of external default extensions, which serves | 325 // Define a per-user source of external default extensions, which serves |
322 // as a source for OEM customization. Mark these default extensions as | 326 // as a source for OEM customization. Mark these default extensions as |
323 // being from the webstore so they can load Native Client modules. | 327 // being from the webstore so they can load Native Client modules. |
324 provider_list->push_back( | 328 provider_list->push_back( |
325 linked_ptr<ExternalExtensionProviderInterface>( | 329 linked_ptr<ExternalExtensionProviderInterface>( |
326 new ExternalExtensionProviderImpl( | 330 new ExternalExtensionProviderImpl( |
327 service, | 331 service, |
328 new ExternalPrefExtensionLoader( | 332 new ExternalPrefExtensionLoader( |
329 chrome::DIR_USER_EXTERNAL_EXTENSIONS, | 333 chrome::DIR_USER_EXTERNAL_EXTENSIONS, |
330 ExternalPrefExtensionLoader::NONE), | 334 ExternalPrefExtensionLoader::NONE), |
331 Extension::EXTERNAL_PREF, | 335 Extension::EXTERNAL_PREF, |
332 Extension::EXTERNAL_PREF_DOWNLOAD, | 336 Extension::EXTERNAL_PREF_DOWNLOAD, |
333 Extension::FROM_WEBSTORE))); | 337 Extension::FROM_WEBSTORE))); |
Mihai Parparita -not on Chrome
2012/05/01 19:09:30
Can you revert this change (Bill's attempted fix i
| |
334 #endif | 338 #endif |
335 #if defined (OS_MACOSX) | 339 #if defined (OS_MACOSX) |
336 // Define a per-user source of external extensions. | 340 // Define a per-user source of external extensions. |
337 provider_list->push_back( | 341 provider_list->push_back( |
338 linked_ptr<ExternalExtensionProviderInterface>( | 342 linked_ptr<ExternalExtensionProviderInterface>( |
339 new ExternalExtensionProviderImpl( | 343 new ExternalExtensionProviderImpl( |
340 service, | 344 service, |
341 new ExternalPrefExtensionLoader( | 345 new ExternalPrefExtensionLoader( |
342 chrome::DIR_USER_EXTERNAL_EXTENSIONS, | 346 chrome::DIR_USER_EXTERNAL_EXTENSIONS, |
343 ExternalPrefExtensionLoader::NONE), | 347 ExternalPrefExtensionLoader::NONE), |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
389 linked_ptr<ExternalExtensionProviderInterface>( | 393 linked_ptr<ExternalExtensionProviderInterface>( |
390 new ExternalExtensionProviderImpl( | 394 new ExternalExtensionProviderImpl( |
391 service, | 395 service, |
392 connector->GetAppPackUpdater()->CreateExternalExtensionLoader(), | 396 connector->GetAppPackUpdater()->CreateExternalExtensionLoader(), |
393 Extension::EXTERNAL_PREF, | 397 Extension::EXTERNAL_PREF, |
394 Extension::INVALID, | 398 Extension::INVALID, |
395 Extension::NO_FLAGS))); | 399 Extension::NO_FLAGS))); |
396 } | 400 } |
397 #endif | 401 #endif |
398 } | 402 } |
OLD | NEW |