| 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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); | 667 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); |
| 668 } | 668 } |
| 669 | 669 |
| 670 Add(IDR_FIRST_RUN_DIALOG_MANIFEST, | 670 Add(IDR_FIRST_RUN_DIALOG_MANIFEST, |
| 671 base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app"))); | 671 base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app"))); |
| 672 | 672 |
| 673 Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, | 673 Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, |
| 674 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); | 674 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); |
| 675 Add(IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST, | 675 Add(IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST, |
| 676 base::FilePath(extension_misc::kConnectivityDiagnosticsLauncherPath)); | 676 base::FilePath(extension_misc::kConnectivityDiagnosticsLauncherPath)); |
| 677 |
| 678 Add(IDR_ARC_SUPPORT_MANIFEST, |
| 679 base::FilePath(FILE_PATH_LITERAL("chromeos/arc_support"))); |
| 677 } | 680 } |
| 678 | 681 |
| 679 // Load ChromeVox extension now if spoken feedback is enabled. | 682 // Load ChromeVox extension now if spoken feedback is enabled. |
| 680 if (chromeos::AccessibilityManager::Get() && | 683 if (chromeos::AccessibilityManager::Get() && |
| 681 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) { | 684 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) { |
| 682 AddChromeVoxExtension(base::Closure()); | 685 AddChromeVoxExtension(base::Closure()); |
| 683 } | 686 } |
| 684 #endif // defined(OS_CHROMEOS) | 687 #endif // defined(OS_CHROMEOS) |
| 685 | 688 |
| 686 #if defined(GOOGLE_CHROME_BUILD) | 689 #if defined(GOOGLE_CHROME_BUILD) |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 manifest.release(), | 792 manifest.release(), |
| 790 root_directory, | 793 root_directory, |
| 791 false); | 794 false); |
| 792 CHECK_EQ(extension_id, actual_extension_id); | 795 CHECK_EQ(extension_id, actual_extension_id); |
| 793 if (!done_cb.is_null()) | 796 if (!done_cb.is_null()) |
| 794 done_cb.Run(); | 797 done_cb.Run(); |
| 795 } | 798 } |
| 796 #endif | 799 #endif |
| 797 | 800 |
| 798 } // namespace extensions | 801 } // namespace extensions |
| OLD | NEW |