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/component_loader.h" | 5 #include "chrome/browser/extensions/component_loader.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
506 | 506 |
507 if (!skip_session_components) { | 507 if (!skip_session_components) { |
508 AddVideoPlayerExtension(); | 508 AddVideoPlayerExtension(); |
509 AddFileManagerExtension(); | 509 AddFileManagerExtension(); |
510 AddGalleryExtension(); | 510 AddGalleryExtension(); |
511 | 511 |
512 AddHangoutServicesExtension(); | 512 AddHangoutServicesExtension(); |
513 AddHotwordHelperExtension(); | 513 AddHotwordHelperExtension(); |
514 AddImageLoaderExtension(); | 514 AddImageLoaderExtension(); |
515 | 515 |
516 if (command_line->HasSwitch(switches::kEnableExperimentalHotwording)) { | |
rpetterson
2014/08/19 18:55:29
I'd make this like the other component extensions
kcarattini
2014/08/20 03:13:27
Done. Also moved the call to AddDefaultComponentEx
| |
517 Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST, | |
518 base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification"))); | |
519 } | |
520 | |
516 #if defined(ENABLE_SETTINGS_APP) | 521 #if defined(ENABLE_SETTINGS_APP) |
517 Add(IDR_SETTINGS_APP_MANIFEST, | 522 Add(IDR_SETTINGS_APP_MANIFEST, |
518 base::FilePath(FILE_PATH_LITERAL("settings_app"))); | 523 base::FilePath(FILE_PATH_LITERAL("settings_app"))); |
519 #endif | 524 #endif |
520 } | 525 } |
521 | 526 |
522 // If (!enable_background_extensions_during_testing || this isn't a test) | 527 // If (!enable_background_extensions_during_testing || this isn't a test) |
523 // install_feedback = false; | 528 // install_feedback = false; |
524 bool install_feedback = enable_background_extensions_during_testing; | 529 bool install_feedback = enable_background_extensions_during_testing; |
525 #if defined(GOOGLE_CHROME_BUILD) | 530 #if defined(GOOGLE_CHROME_BUILD) |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
633 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); | 638 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); |
634 fileapi::FileSystemContext* file_system_context = | 639 fileapi::FileSystemContext* file_system_context = |
635 content::BrowserContext::GetStoragePartitionForSite( | 640 content::BrowserContext::GetStoragePartitionForSite( |
636 off_the_record_context, site)->GetFileSystemContext(); | 641 off_the_record_context, site)->GetFileSystemContext(); |
637 file_system_context->EnableTemporaryFileSystemInIncognito(); | 642 file_system_context->EnableTemporaryFileSystemInIncognito(); |
638 } | 643 } |
639 #endif | 644 #endif |
640 } | 645 } |
641 | 646 |
642 } // namespace extensions | 647 } // namespace extensions |
OLD | NEW |