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_provider_impl.h" | 5 #include "chrome/browser/extensions/external_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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 // extension installer codeflow. | 398 // extension installer codeflow. |
399 provider_list->push_back( | 399 provider_list->push_back( |
400 linked_ptr<ExternalProviderInterface>( | 400 linked_ptr<ExternalProviderInterface>( |
401 new default_apps::Provider( | 401 new default_apps::Provider( |
402 profile, | 402 profile, |
403 service, | 403 service, |
404 new ExternalPrefLoader(chrome::DIR_DEFAULT_APPS, | 404 new ExternalPrefLoader(chrome::DIR_DEFAULT_APPS, |
405 ExternalPrefLoader::NONE), | 405 ExternalPrefLoader::NONE), |
406 Extension::INTERNAL, | 406 Extension::INTERNAL, |
407 Extension::INVALID, | 407 Extension::INVALID, |
408 Extension::FROM_WEBSTORE))); | 408 Extension::FROM_WEBSTORE | |
| 409 Extension::WAS_INSTALLED_BY_DEFAULT))); |
409 #endif | 410 #endif |
410 | 411 |
411 #if defined(OS_CHROMEOS) | 412 #if defined(OS_CHROMEOS) |
412 policy::BrowserPolicyConnector* connector = | 413 policy::BrowserPolicyConnector* connector = |
413 g_browser_process->browser_policy_connector(); | 414 g_browser_process->browser_policy_connector(); |
414 if (is_chromeos_demo_session && connector->GetAppPackUpdater()) { | 415 if (is_chromeos_demo_session && connector->GetAppPackUpdater()) { |
415 provider_list->push_back( | 416 provider_list->push_back( |
416 linked_ptr<ExternalProviderInterface>( | 417 linked_ptr<ExternalProviderInterface>( |
417 new ExternalProviderImpl( | 418 new ExternalProviderImpl( |
418 service, | 419 service, |
419 connector->GetAppPackUpdater()->CreateExternalLoader(), | 420 connector->GetAppPackUpdater()->CreateExternalLoader(), |
420 Extension::EXTERNAL_PREF, | 421 Extension::EXTERNAL_PREF, |
421 Extension::INVALID, | 422 Extension::INVALID, |
422 Extension::NO_FLAGS))); | 423 Extension::NO_FLAGS))); |
423 } | 424 } |
424 #endif | 425 #endif |
425 } | 426 } |
426 | 427 |
427 } // namespace extensions | 428 } // namespace extensions |
OLD | NEW |