diff --git a/ui/keyboard/keyboard_resources.grd b/ui/keyboard/keyboard_resources.grd index 1fbf9684ffdb83..1252d82a84f49f 100644 --- a/ui/keyboard/keyboard_resources.grd +++ b/ui/keyboard/keyboard_resources.grd @@ -64,6 +64,7 @@ + diff --git a/ui/keyboard/keyboard_ui_controller.cc b/ui/keyboard/keyboard_ui_controller.cc index 1c37cdf35a4e12..420b933cf1f520 100644 --- a/ui/keyboard/keyboard_ui_controller.cc +++ b/ui/keyboard/keyboard_ui_controller.cc @@ -86,6 +86,7 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() { IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY); source->AddResourcePath("main.js", IDR_KEYBOARD_MAIN_JS); source->AddResourcePath("polymer_loader.js", IDR_KEYBOARD_POLYMER_LOADER); + source->AddResourcePath("roboto_bold.ttf", IDR_KEYBOARD_ROBOTO_BOLD_TTF); source->AddResourcePath("voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS); // These files are specific to the WebUI version diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc index 7b4d475487cc57..e21f0745dc7989 100644 --- a/ui/keyboard/keyboard_util.cc +++ b/ui/keyboard/keyboard_util.cc @@ -273,6 +273,7 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, {"keyboard/polymer_loader.js", IDR_KEYBOARD_POLYMER_LOADER}, + {"keyboard/roboto_bold.ttf", IDR_KEYBOARD_ROBOTO_BOLD_TTF}, {"keyboard/voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS}, }; static const size_t kKeyboardResourcesSize = arraysize(kKeyboardResources); diff --git a/ui/keyboard/resources/elements/kb-key.html b/ui/keyboard/resources/elements/kb-key.html index 34598ed5467e91..bd7da2acd404c2 100644 --- a/ui/keyboard/resources/elements/kb-key.html +++ b/ui/keyboard/resources/elements/kb-key.html @@ -18,7 +18,7 @@ border-style: solid; border-width: 1px 0px; color: #ffffff; - font-family: 'Open Sans', 'Noto Sans UI', sans-serif; + font-family: roboto-bold; font-weight: 300; } diff --git a/ui/keyboard/resources/main.css b/ui/keyboard/resources/main.css index 667a3b75914eb9..6b77ce51608a9b 100644 --- a/ui/keyboard/resources/main.css +++ b/ui/keyboard/resources/main.css @@ -4,6 +4,11 @@ found in the LICENSE file. */ +@font-face { + font-family: roboto-bold; + src: url(roboto_bold.ttf); +} + body { -webkit-user-select: none; background-image: -webkit-linear-gradient(#282828, #000000); diff --git a/ui/keyboard/resources/roboto_bold.ttf b/ui/keyboard/resources/roboto_bold.ttf new file mode 100644 index 00000000000000..aaf374d2cc000c Binary files /dev/null and b/ui/keyboard/resources/roboto_bold.ttf differ