diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 10:55:11 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 10:55:11 +0000 |
| commit | eae6aa4eb65e2d844164a7919d7a39255a2abee1 (patch) | |
| tree | 52fe6ebae0f33907ee23f5c5c0901e8272293791 /ui/keyboard/keyboard.cc | |
| parent | 82dcd1c4bf0d0d857d303ee86638738ee0bea42a (diff) | |
| download | chromium_src-eae6aa4eb65e2d844164a7919d7a39255a2abee1.zip chromium_src-eae6aa4eb65e2d844164a7919d7a39255a2abee1.tar.gz chromium_src-eae6aa4eb65e2d844164a7919d7a39255a2abee1.tar.bz2 | |
athena: Use mojo to provide the bindings for the virtual keyboard.
Remove the gin/v8 based bindings, in favour of bindings provided by mojo. Use
the same mechanism as chrome://omnibox to provide the bindings for the virtual
keyboard when the VK extension API is not available.
BUG=380215, 387276
R=sky@chromium.org
Review URL: https://codereview.chromium.org/328303008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard/keyboard.cc')
| -rw-r--r-- | ui/keyboard/keyboard.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ui/keyboard/keyboard.cc b/ui/keyboard/keyboard.cc index 436b935..2d4de13 100644 --- a/ui/keyboard/keyboard.cc +++ b/ui/keyboard/keyboard.cc @@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/keyboard/webui/vk_webui_controller.h" namespace keyboard { @@ -29,4 +30,17 @@ void InitializeKeyboard() { pak_file, ui::SCALE_FACTOR_100P); } +void InitializeWebUIBindings() { + CHECK(initialized); + base::FilePath content_resources; + DCHECK(PathService::Get(base::DIR_MODULE, &content_resources)); + content_resources = + content_resources.Append(FILE_PATH_LITERAL("content_resources.pak")); + ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( + content_resources, ui::SCALE_FACTOR_100P); + + content::WebUIControllerFactory::RegisterFactory( + VKWebUIControllerFactory::GetInstance()); +} + } // namespace keyboard |