Index: chrome/browser/extensions/component_loader.cc |
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc |
index 82f4d809ebdbeb94b92ed98fdf28f838e93669cb..049dbdf8e4ce347a11c1b08990d22b36ad418650 100644 |
--- a/chrome/browser/extensions/component_loader.cc |
+++ b/chrome/browser/extensions/component_loader.cc |
@@ -26,6 +26,7 @@ |
#include "content/public/browser/notification_source.h" |
#include "extensions/common/id_util.h" |
#include "grit/browser_resources.h" |
+#include "grit/keyboard_resources.h" |
#include "ui/base/resource/resource_bundle.h" |
#if defined(OFFICIAL_BUILD) |
@@ -333,6 +334,13 @@ void ComponentLoader::AddChromeApp() { |
#endif |
} |
+void ComponentLoader::AddKeyboardApp() { |
+#if defined(USE_ASH) |
+ std::string id = Add(IDR_KEYBOARD_MANIFEST, |
+ base::FilePath(FILE_PATH_LITERAL("keyboard"))); |
sadrul
2013/04/15 17:17:27
Did you plan on using |id|?
bryeung
2013/04/15 17:50:56
Leftover from debugging (where I was LOG'ing it).
|
+#endif |
+} |
+ |
// static |
void ComponentLoader::EnableBackgroundExtensionsForTesting() { |
enable_background_extensions_during_testing = true; |
@@ -387,6 +395,10 @@ void ComponentLoader::AddDefaultComponentExtensions( |
AddChromeApp(); |
} |
+#if defined(USE_AURA) |
+ AddKeyboardApp(); |
+#endif |
+ |
AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components); |
} |