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

trunk/src/chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/id_util.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(USE_AURA)
-#include "grit/keyboard_resources.h"
-#endif
-
 #if defined(OFFICIAL_BUILD)
 #include "chrome/browser/defaults.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(ENABLE_APP_LIST)
@@ skipping 285 matching lines @@
 
   if (manifest) {
     // Update manifest to use a proper name.
     manifest->SetString(extension_manifest_keys::kName,
                         l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME));
     Add(manifest, base::FilePath(FILE_PATH_LITERAL("chrome_app")));
   }
 #endif
 }
 
-void ComponentLoader::AddKeyboardApp() {
-#if defined(USE_AURA)
-  Add(IDR_KEYBOARD_MANIFEST, base::FilePath(FILE_PATH_LITERAL("keyboard")));
-#endif
-}
-
 // static
 void ComponentLoader::EnableBackgroundExtensionsForTesting() {
   enable_background_extensions_during_testing = true;
 }
 
 void ComponentLoader::AddDefaultComponentExtensions(
     bool skip_session_components) {
   // Do not add component extensions that have background pages here -- add them
   // to AddDefaultComponentExtensionsWithBackgroundPages.
 #if defined(OS_CHROMEOS)
@@ skipping 34 matching lines @@
 
     // If a URL for the enterprise webstore has been specified, load the
     // component extension. This extension might also be loaded later, because
     // it is specified by policy, and on ChromeOS policies are loaded after
     // the browser process has started.
     AddOrReloadEnterpriseWebStore();
 
     AddChromeApp();
   }
 
-  AddKeyboardApp();
-
   AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     bool skip_session_components) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Component extensions with background pages are not enabled during tests
   // because they generate a lot of background behavior that can interfere.
   if (!enable_background_extensions_during_testing &&
@@ skipping 75 matching lines @@
 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
                                std::string() /* default_value */,
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kEnterpriseWebStoreName,
                                std::string() /* default_value */,
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace extensions