Revert 194579 "Add a virtual keyboard webui at chrome://keyboard/"

> Add a virtual keyboard webui at chrome://keyboard/
> 
> This is just the old virtual keyboard that was removed a couple of years
> ago, being used as a temporary stand-in.
> 
> BUG=222801
> 
> Review URL: https://codereview.chromium.org/13652010

TBR=bryeung@chromium.org

Review URL: https://codereview.chromium.org/14031009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194585 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 4 insertions, 43 deletions

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index a9fb3fb..4595e85 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -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 @@ void ComponentLoader::AddChromeApp() {
 #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 @@ void ComponentLoader::AddDefaultComponentExtensions(
     AddChromeApp();
   }
 
-#if defined(USE_AURA)
-  AddKeyboardApp();
-#endif
-
   AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
 }
 
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
index a914f8e..aef7975 100644
--- a/chrome/browser/extensions/component_loader.h
+++ b/chrome/browser/extensions/component_loader.h
@@ -127,7 +127,6 @@ class ComponentLoader {
   void AddOrReloadEnterpriseWebStore();
 
   void AddChromeApp();
-  void AddKeyboardApp();
 
   // Unloads |component| from the memory.
   void UnloadComponent(ComponentExtensionInfo* component);
diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc
index cc948e5..cc3d435 100644
--- a/chrome/browser/extensions/image_loader.cc
+++ b/chrome/browser/extensions/image_loader.cc
@@ -16,7 +16,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "grit/component_extension_resources_map.h"
-#include "grit/keyboard_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -171,21 +170,6 @@ bool ImageLoader::IsComponentExtensionResource(
     {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
     {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
 #endif
-#if defined(USE_AURA)
-    {"keyboard/index.html", IDR_KEYBOARD_INDEX},
-    {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
-    {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
-    {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS},
-    {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS},
-    {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON},
-    {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL},
-    {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
-    {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
-    {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET},
-    {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN},
-    {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
-    {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
-#endif
   };
   static const size_t kExtraComponentExtensionResourcesSize =
       arraysize(kExtraComponentExtensionResources);
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 0b054c6..40a1b99 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -98,8 +98,6 @@
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/webui/gesture_config_ui.h"
-#include "ui/keyboard/keyboard_constants.h"
-#include "ui/keyboard/keyboard_ui_controller.h"
 #endif
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -359,8 +357,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 #if defined(USE_AURA)
   if (url.host() == chrome::kChromeUIGestureConfigHost)
     return &NewWebUI<GestureConfigUI>;
-  if (url.host() == keyboard::kKeyboardWebUIHost)
-    return &NewWebUI<keyboard::KeyboardUIController>;
 #endif
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index b473602..7484943 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -40,7 +40,6 @@
         '../third_party/libusb/libusb.gyp:libusb',
         '../third_party/re2/re2.gyp:re2',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
-        '../ui/keyboard/keyboard.gyp:keyboard_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../webkit/support/webkit_support.gyp:glue',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index e74f3f5..c8e2db9 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2498,8 +2498,6 @@
             # aura uses some of ash resources.
             '../ash/ash.gyp:ash_resources',
             '../ui/aura/aura.gyp:aura',
-            '../ui/keyboard/keyboard.gyp:keyboard',
-            '../ui/keyboard/keyboard.gyp:keyboard_resources',
           ],
           'conditions': [
             ['OS=="win"', {
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi
index 85a8449..f64cc1e 100644
--- a/chrome/chrome_repack_resources.gypi
+++ b/chrome/chrome_repack_resources.gypi
@@ -15,7 +15,6 @@
       ['OS != "ios" and OS != "android"', {
         # New paks should be added here by default.
         'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
           '<(grit_out_dir)/component_extension_resources.pak',
           '<(grit_out_dir)/options_resources.pak',
diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc
index 20b399a..690cc03 100644
--- a/chrome/common/extensions/manifest_url_handler.cc
+++ b/chrome/common/extensions/manifest_url_handler.cc
@@ -22,10 +22,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(USE_AURA)
-#include "ui/keyboard/keyboard_constants.h"
-#endif
-
 namespace keys = extension_manifest_keys;
 namespace errors = extension_manifest_errors;
 
@@ -280,9 +276,6 @@ bool URLOverridesHandler::Parse(Extension* extension, string16* error) {
                    !(extension->location() == Manifest::COMPONENT &&
                      page == chrome::kChromeUIFileManagerHost));
 #endif
-#if defined(USE_AURA)
-    is_override = (is_override && page != keyboard::kKeyboardWebUIHost);
-#endif
 
     if (is_override || !iter.value().GetAsString(&val)) {
       *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 8783a87d..aca09f2 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -47,6 +47,7 @@ const char kChromeUIHistoryFrameURL[] = "chrome://history-frame/";
 const char kChromeUIInspectURL[] = "chrome://inspect/";
 const char kChromeUIInstantURL[] = "chrome://instant/";
 const char kChromeUIIPCURL[] = "chrome://ipc/";
+const char kChromeUIKeyboardURL[] = "chrome://keyboard/";
 const char kChromeUIManagedUserPassphrasePageURL[] =
     "chrome://managed-user-passphrase/";
 const char kChromeUIMemoryRedirectURL[] = "chrome://memory-redirect/";
@@ -166,6 +167,7 @@ const char kChromeUIHistoryFrameHost[] = "history-frame";
 const char kChromeUIInspectHost[] = "inspect";
 const char kChromeUIInstantHost[] = "instant";
 const char kChromeUIIPCHost[] = "ipc";
+const char kChromeUIKeyboardHost[] = "keyboard";
 const char kChromeUIKillHost[] = "kill";
 const char kChromeUIManagedUserPassphrasePageHost[] = "managed-user-passphrase";
 const char kChromeUIMemoryHost[] = "memory";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 7f33c51..dcb0c88 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -46,6 +46,7 @@ extern const char kChromeUIHistoryFrameURL[];
 extern const char kChromeUIInspectURL[];
 extern const char kChromeUIInstantURL[];
 extern const char kChromeUIIPCURL[];
+extern const char kChromeUIKeyboardURL[];
 extern const char kChromeUIManagedUserPassphrasePageURL[];
 extern const char kChromeUIMemoryRedirectURL[];
 extern const char kChromeUIMemoryURL[];
@@ -159,6 +160,7 @@ extern const char kChromeUIHistoryFrameHost[];
 extern const char kChromeUIInspectHost[];
 extern const char kChromeUIInstantHost[];
 extern const char kChromeUIIPCHost[];
+extern const char kChromeUIKeyboardHost[];
 extern const char kChromeUIKillHost[];
 extern const char kChromeUIManagedUserPassphrasePageHost[];
 extern const char kChromeUIMemoryHost[];