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/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 AddHotwordAudioVerificationApp(); | 582 AddHotwordAudioVerificationApp(); |
583 AddHotwordHelperExtension(); | 583 AddHotwordHelperExtension(); |
584 AddImageLoaderExtension(); | 584 AddImageLoaderExtension(); |
585 | 585 |
586 bool install_feedback = enable_background_extensions_during_testing; | 586 bool install_feedback = enable_background_extensions_during_testing; |
587 #if defined(GOOGLE_CHROME_BUILD) | 587 #if defined(GOOGLE_CHROME_BUILD) |
588 install_feedback = true; | 588 install_feedback = true; |
589 #endif // defined(GOOGLE_CHROME_BUILD) | 589 #endif // defined(GOOGLE_CHROME_BUILD) |
590 if (install_feedback) | 590 if (install_feedback) |
591 Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); | 591 Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); |
592 | |
593 #if defined(ENABLE_SETTINGS_APP) | |
594 Add(IDR_SETTINGS_APP_MANIFEST, | |
595 base::FilePath(FILE_PATH_LITERAL("settings_app"))); | |
596 #endif | |
597 } | 592 } |
598 | 593 |
599 #if defined(OS_CHROMEOS) | 594 #if defined(OS_CHROMEOS) |
600 if (!skip_session_components) { | 595 if (!skip_session_components) { |
601 #if defined(GOOGLE_CHROME_BUILD) | 596 #if defined(GOOGLE_CHROME_BUILD) |
602 if (!command_line->HasSwitch( | 597 if (!command_line->HasSwitch( |
603 chromeos::switches::kDisableOfficeEditingComponentApp)) { | 598 chromeos::switches::kDisableOfficeEditingComponentApp)) { |
604 std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath( | 599 std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath( |
605 FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice"))); | 600 FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice"))); |
606 EnableFileSystemInGuestMode(id); | 601 EnableFileSystemInGuestMode(id); |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
719 manifest.release(), | 714 manifest.release(), |
720 root_directory, | 715 root_directory, |
721 false); | 716 false); |
722 CHECK_EQ(extension_id, actual_extension_id); | 717 CHECK_EQ(extension_id, actual_extension_id); |
723 if (!done_cb.is_null()) | 718 if (!done_cb.is_null()) |
724 done_cb.Run(); | 719 done_cb.Run(); |
725 } | 720 } |
726 #endif | 721 #endif |
727 | 722 |
728 } // namespace extensions | 723 } // namespace extensions |
OLD | NEW |