Commit 7b06b28a authored by rsadam@chromium.org's avatar rsadam@chromium.org

Adds support for the search key in the Virtual Keyboard. We currently do not...

Adds support for the search key in the Virtual Keyboard. We currently do not use the search key, but may need it in future layouts.

BUG=315071

Review URL: https://codereview.chromium.org/59813004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235803 0039d316-1c4b-4281-b951-d872f2087c98
parent 720e7d2e
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<include name="IDR_KEYBOARD_IMAGES_MUTE" file="resources/images/mute.svg" type="BINDATA" /> <include name="IDR_KEYBOARD_IMAGES_MUTE" file="resources/images/mute.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_RELOAD" file="resources/images/reload.svg" type="BINDATA" /> <include name="IDR_KEYBOARD_IMAGES_RELOAD" file="resources/images/reload.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_RIGHT" file="resources/images/right.svg" type="BINDATA" /> <include name="IDR_KEYBOARD_IMAGES_RIGHT" file="resources/images/right.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_SEARCH" file="resources/images/search.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_SHUTDOWN" file="resources/images/shutdown.svg" type="BINDATA" /> <include name="IDR_KEYBOARD_IMAGES_SHUTDOWN" file="resources/images/shutdown.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_UP" file="resources/images/up.svg" type="BINDATA" /> <include name="IDR_KEYBOARD_IMAGES_UP" file="resources/images/up.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_VOLUME_DOWN" file="resources/images/volume-down.svg" type="BINDATA" /> <include name="IDR_KEYBOARD_IMAGES_VOLUME_DOWN" file="resources/images/volume-down.svg" type="BINDATA" />
......
...@@ -69,6 +69,8 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() { ...@@ -69,6 +69,8 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() {
IDR_KEYBOARD_IMAGES_RELOAD); IDR_KEYBOARD_IMAGES_RELOAD);
source->AddResourcePath("images/right.svg", source->AddResourcePath("images/right.svg",
IDR_KEYBOARD_IMAGES_RIGHT); IDR_KEYBOARD_IMAGES_RIGHT);
source->AddResourcePath("images/search.svg",
IDR_KEYBOARD_IMAGES_SEARCH);
source->AddResourcePath("images/shutdown.svg", source->AddResourcePath("images/shutdown.svg",
IDR_KEYBOARD_IMAGES_SHUTDOWN); IDR_KEYBOARD_IMAGES_SHUTDOWN);
source->AddResourcePath("images/up.svg", source->AddResourcePath("images/up.svg",
......
...@@ -224,6 +224,7 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { ...@@ -224,6 +224,7 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
{"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE}, {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
{"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD}, {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
{"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT}, {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
{"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH},
{"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN}, {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
{"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP}, {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
{"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN}, {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
......
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
'Back': {keyCode: 0xA6, shiftModifier: false}, 'Back': {keyCode: 0xA6, shiftModifier: false},
'Forward': {keyCode: 0xA7, shiftModifier: false}, 'Forward': {keyCode: 0xA7, shiftModifier: false},
'Reload': {keyCode: 0xA8, shiftModifier: false}, 'Reload': {keyCode: 0xA8, shiftModifier: false},
'Search': {keyCode: 0xAA, shiftModifier: false},
'Mute': {keyCode: 0xAD, shiftModifier: false}, 'Mute': {keyCode: 0xAD, shiftModifier: false},
'Volume-Down': {keyCode: 0xAE, shiftModifier: false}, 'Volume-Down': {keyCode: 0xAE, shiftModifier: false},
'Volume-Up': {keyCode: 0xAF, shiftModifier: false}, 'Volume-Up': {keyCode: 0xAF, shiftModifier: false},
......
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="97.000000pt" height="58.000000pt" viewBox="0 0 97.000000 58.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,58.000000) scale(0.100000,-0.100000)"
fill="#ffffff" stroke="none">
<path d="M385 395 c-34 -33 -35 -102 -2 -133 27 -26 78 -38 102 -25 13 8 26 0
60 -36 42 -44 45 -45 62 -28 17 17 16 20 -28 61 -38 37 -44 47 -37 66 11 30
-7 86 -35 105 -34 24 -94 19 -122 -10z m110 -35 c35 -39 -6 -99 -59 -86 -16 4
-31 17 -37 33 -22 58 54 100 96 53z"/>
</g>
</svg>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
--> -->
<template> <template>
<Kb-key class="esc dark" char="Esc">esc</kb-key> <kb-key class="esc dark" char="Esc">esc</kb-key>
<kb-key class="back dark" char="Back"></kb-key> <kb-key class="back dark" char="Back"></kb-key>
<kb-key class="forward dark" char="Forward"></kb-key> <kb-key class="forward dark" char="Forward"></kb-key>
<kb-key class="reload dark" char="Reload"></kb-key> <kb-key class="reload dark" char="Reload"></kb-key>
......
...@@ -252,6 +252,10 @@ kb-key:-webkit-any(.backspace, ...@@ -252,6 +252,10 @@ kb-key:-webkit-any(.backspace,
background-image: url('images/right.svg'); background-image: url('images/right.svg');
} }
.search{
background-image: url('images/search.svg');
}
.shutdown { .shutdown {
background-image: url('images/shutdown.svg'); background-image: url('images/shutdown.svg');
} }
...@@ -282,6 +286,7 @@ kb-key:-webkit-any(.backspace, ...@@ -282,6 +286,7 @@ kb-key:-webkit-any(.backspace,
.mute, .mute,
.reload, .reload,
.right, .right,
.search,
.shutdown, .shutdown,
.up, .up,
.volume-down, .volume-down,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment