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

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

Issue 138053004: Deprecate the External Extension Install via Preferences file (Windows only). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverting changes to HTML file Created 6 years, 11 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) 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_provider_impl.h" 5 #include "chrome/browser/extensions/external_provider_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 service, 454 service,
455 app_pack_updater->CreateExternalLoader(), 455 app_pack_updater->CreateExternalLoader(),
456 profile, 456 profile,
457 Manifest::EXTERNAL_PREF, 457 Manifest::EXTERNAL_PREF,
458 Manifest::INVALID_LOCATION, 458 Manifest::INVALID_LOCATION,
459 Extension::NO_FLAGS))); 459 Extension::NO_FLAGS)));
460 } 460 }
461 #endif 461 #endif
462 462
463 if (!profile->IsManaged() && !is_chromeos_demo_session) { 463 if (!profile->IsManaged() && !is_chromeos_demo_session) {
464 #if !defined(OS_WIN)
464 provider_list->push_back( 465 provider_list->push_back(
465 linked_ptr<ExternalProviderInterface>( 466 linked_ptr<ExternalProviderInterface>(
466 new ExternalProviderImpl( 467 new ExternalProviderImpl(
467 service, 468 service,
468 new ExternalPrefLoader(chrome::DIR_EXTERNAL_EXTENSIONS, 469 new ExternalPrefLoader(chrome::DIR_EXTERNAL_EXTENSIONS,
469 check_admin_permissions_on_mac), 470 check_admin_permissions_on_mac),
470 profile, 471 profile,
471 Manifest::EXTERNAL_PREF, 472 Manifest::EXTERNAL_PREF,
472 Manifest::EXTERNAL_PREF_DOWNLOAD, 473 Manifest::EXTERNAL_PREF_DOWNLOAD,
473 bundled_extension_creation_flags))); 474 bundled_extension_creation_flags)));
475 #endif
474 476
475 #if defined(OS_CHROMEOS) || defined (OS_MACOSX) 477 #if defined(OS_CHROMEOS) || defined (OS_MACOSX)
476 // Define a per-user source of external extensions. 478 // Define a per-user source of external extensions.
477 // On Chrome OS, this serves as a source for OEM customization. 479 // On Chrome OS, this serves as a source for OEM customization.
478 provider_list->push_back( 480 provider_list->push_back(
479 linked_ptr<ExternalProviderInterface>( 481 linked_ptr<ExternalProviderInterface>(
480 new ExternalProviderImpl( 482 new ExternalProviderImpl(
481 service, 483 service,
482 new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, 484 new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
483 ExternalPrefLoader::NONE), 485 ExternalPrefLoader::NONE),
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 service, 523 service,
522 new ExternalComponentLoader(profile), 524 new ExternalComponentLoader(profile),
523 profile, 525 profile,
524 Manifest::INVALID_LOCATION, 526 Manifest::INVALID_LOCATION,
525 Manifest::EXTERNAL_COMPONENT, 527 Manifest::EXTERNAL_COMPONENT,
526 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); 528 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
527 } 529 }
528 } 530 }
529 531
530 } // namespace extensions 532 } // namespace extensions
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