Change to roboto font.

BUG=332073 Review URL: https://codereview.chromium.org/134023003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250171 0039d316-1c4b-4281-b951-d872f2087c98
hylschwy · Feb 10, 2014 · e67e118 · e67e118
1 parent 27efb2b
commit e67e118
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/ui/keyboard/keyboard_resources.grd b/ui/keyboard/keyboard_resources.grd
@@ -64,6 +64,7 @@
       <include name="IDR_KEYBOARD_MANIFEST" file="resources/manifest.json" type="BINDATA" />
       <include name="IDR_KEYBOARD_MAIN_CSS" file="resources/main.css" type="BINDATA" />
       <include name="IDR_KEYBOARD_POLYMER_LOADER" file="resources/polymer_loader.js" flattenhtml="true" type="BINDATA" />
+      <include name="IDR_KEYBOARD_ROBOTO_BOLD_TTF" file="resources/roboto_bold.ttf" type="BINDATA" />
       <include name="IDR_KEYBOARD_SPACEBAR_ROW" file="resources/layouts/spacebar-row.html" type="BINDATA" />
       <include name="IDR_KEYBOARD_VOICE_INPUT_JS" file="resources/voice_input.js" type="BINDATA" />
       <include name="IDR_KEYBOARD_WEBUI_INDEX" file="resources/webui_index.html" allowexternalscript="true" type="BINDATA" />

diff --git 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
@@ -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
@@ -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
@@ -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