| Index: trunk/src/chrome/browser/extensions/component_loader.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/extensions/component_loader.cc (revision 194584)
|
| +++ trunk/src/chrome/browser/extensions/component_loader.cc (working copy)
|
| @@ -26,7 +26,6 @@
|
| #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)
|
| @@ -334,12 +333,6 @@
|
| #endif
|
| }
|
|
|
| -void ComponentLoader::AddKeyboardApp() {
|
| -#if defined(USE_ASH)
|
| - Add(IDR_KEYBOARD_MANIFEST, base::FilePath(FILE_PATH_LITERAL("keyboard")));
|
| -#endif
|
| -}
|
| -
|
| // static
|
| void ComponentLoader::EnableBackgroundExtensionsForTesting() {
|
| enable_background_extensions_during_testing = true;
|
| @@ -394,10 +387,6 @@
|
| AddChromeApp();
|
| }
|
|
|
| -#if defined(USE_AURA)
|
| - AddKeyboardApp();
|
| -#endif
|
| -
|
| AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
|
| }
|
|
|
|
|