Index: ui/keyboard/keyboard.cc |
diff --git a/ui/keyboard/keyboard.cc b/ui/keyboard/keyboard.cc |
index d7901270a03d7e1a902aad33e147dd6017fc8f8d..436b93595f925ec97be82f1ee69b977330e615a5 100644 |
--- a/ui/keyboard/keyboard.cc |
+++ b/ui/keyboard/keyboard.cc |
@@ -5,71 +5,14 @@ |
#include "ui/keyboard/keyboard.h" |
#include "base/files/file_path.h" |
-#include "base/memory/singleton.h" |
#include "base/path_service.h" |
-#include "content/public/browser/browser_context.h" |
-#include "content/public/browser/web_ui_controller_factory.h" |
#include "ui/base/resource/resource_bundle.h" |
-#include "ui/keyboard/keyboard_constants.h" |
-#include "ui/keyboard/keyboard_ui_controller.h" |
-#include "url/gurl.h" |
- |
-namespace { |
- |
-using content::BrowserContext; |
-using content::WebUI; |
-using content::WebUIController; |
- |
-class KeyboardWebUIControllerFactory : public content::WebUIControllerFactory { |
- public: |
- // |WebUIControllerFactory| implementation: |
- virtual content::WebUI::TypeID GetWebUIType( |
- content::BrowserContext* browser_context, |
- const GURL& url) const OVERRIDE { |
- if (url == GURL(keyboard::kKeyboardWebUIURL)) |
- return const_cast<KeyboardWebUIControllerFactory*>(this); |
- |
- return WebUI::kNoWebUI; |
- } |
- virtual bool UseWebUIForURL(content::BrowserContext* browser_context, |
- const GURL& url) const OVERRIDE { |
- return GetWebUIType(browser_context, url) != WebUI::kNoWebUI; |
- } |
- virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context, |
- const GURL& url) const OVERRIDE { |
- return UseWebUIForURL(browser_context, url); |
- } |
- virtual content::WebUIController* CreateWebUIControllerForURL( |
- content::WebUI* web_ui, |
- const GURL& url) const OVERRIDE { |
- if (url == GURL(keyboard::kKeyboardWebUIURL)) |
- return new keyboard::KeyboardUIController(web_ui); |
- return NULL; |
- } |
- |
- static KeyboardWebUIControllerFactory* GetInstance() { |
- return Singleton<KeyboardWebUIControllerFactory>::get(); |
- } |
- |
- protected: |
- KeyboardWebUIControllerFactory() {} |
- virtual ~KeyboardWebUIControllerFactory() {} |
- |
- private: |
- friend struct DefaultSingletonTraits<KeyboardWebUIControllerFactory>; |
- |
- DISALLOW_COPY_AND_ASSIGN(KeyboardWebUIControllerFactory); |
-}; |
- |
-} // namespace |
namespace keyboard { |
static bool initialized = false; |
void ResetKeyboardForTesting() { |
- content::WebUIControllerFactory::UnregisterFactoryForTesting( |
- KeyboardWebUIControllerFactory::GetInstance()); |
initialized = false; |
} |
@@ -84,9 +27,6 @@ void InitializeKeyboard() { |
FILE_PATH_LITERAL("keyboard_resources.pak")); |
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
pak_file, ui::SCALE_FACTOR_100P); |
- |
- content::WebUIControllerFactory::RegisterFactory( |
- KeyboardWebUIControllerFactory::GetInstance()); |
} |
} // namespace keyboard |