Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(599)

Unified Diff: ui/keyboard/keyboard.cc

Issue 328303008: athena: Use mojo to provide the bindings for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/keyboard/keyboard.h ('k') | ui/keyboard/keyboard.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard.cc
diff --git a/ui/keyboard/keyboard.cc b/ui/keyboard/keyboard.cc
index 436b93595f925ec97be82f1ee69b977330e615a5..2d4de139ddcd316a57d6f7ed13dec0494ddfb30c 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
« no previous file with comments | « ui/keyboard/keyboard.h ('k') | ui/keyboard/keyboard.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698