Keyboard: rename mic to microphone.

It was suggested in a recent code review that the abbreviation "mic"
could be confusing for some people.  This changes all instances to
"microphone".

BUG=none

Review URL: https://chromiumcodereview.appspot.com/18089008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210243 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 55 insertions, 23 deletions

diff --git a/ui/keyboard/keyboard_resources.grd b/ui/keyboard/keyboard_resources.grd
index 11d0d16..6aaef19 100644
--- a/ui/keyboard/keyboard_resources.grd
+++ b/ui/keyboard/keyboard_resources.grd
@@ -25,8 +25,8 @@
       <include name="IDR_KEYBOARD_ELEMENTS_KEYSET" file="resources/elements/kb-keyset.html" type="BINDATA" />
       <include name="IDR_KEYBOARD_ELEMENTS_ROW" file="resources/elements/kb-row.html" type="BINDATA" />
       <include name="IDR_KEYBOARD_IMAGES_KEYBOARD" file="resources/images/keyboard.svg" type="BINDATA" />
-      <include name="IDR_KEYBOARD_IMAGES_MIC" file="resources/images/mic.svg" type="BINDATA" />
-      <include name="IDR_KEYBOARD_IMAGES_MIC_GREEN" file="resources/images/mic-green.svg" type="BINDATA" />
+      <include name="IDR_KEYBOARD_IMAGES_MICROPHONE" file="resources/images/microphone.svg" type="BINDATA" />
+      <include name="IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN" file="resources/images/microphone-green.svg" type="BINDATA" />
       <!-- Don't flatten html file here. Otherwise, webui keyboard will not load the correct css file. -->
       <include name="IDR_KEYBOARD_INDEX" file="resources/index.html" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_KEYBOARD_KEYSETS" file="resources/keysets.html" type="BINDATA" />
diff --git a/ui/keyboard/keyboard_ui_controller.cc b/ui/keyboard/keyboard_ui_controller.cc
index 3b7ecba..7c524fd 100644
--- a/ui/keyboard/keyboard_ui_controller.cc
+++ b/ui/keyboard/keyboard_ui_controller.cc
@@ -32,9 +32,10 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() {
   source->AddResourcePath("elements/kb-keyset.html",
                           IDR_KEYBOARD_ELEMENTS_KEYSET);
   source->AddResourcePath("elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW);
-  source->AddResourcePath("images/mic.svg", IDR_KEYBOARD_IMAGES_MIC);
-  source->AddResourcePath("images/mic-green.svg",
-                          IDR_KEYBOARD_IMAGES_MIC_GREEN);
+  source->AddResourcePath("images/microphone.svg",
+                          IDR_KEYBOARD_IMAGES_MICROPHONE);
+  source->AddResourcePath("images/microphone-green.svg",
+                          IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN);
   source->AddResourcePath("main.js", IDR_KEYBOARD_MAIN_JS);
   source->AddResourcePath("polymer.min.js", IDR_KEYBOARD_POLYMER);
   source->AddResourcePath("voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS);
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 98bf0dd..85f32f1 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -80,8 +80,9 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
     {"keyboard/elements/kb-keyset.html", IDR_KEYBOARD_ELEMENTS_KEYSET},
     {"keyboard/elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW},
     {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
-    {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
-    {"keyboard/images/mic-green.svg", IDR_KEYBOARD_IMAGES_MIC_GREEN},
+    {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
+    {"keyboard/images/microphone-green.svg",
+        IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
     {"keyboard/index.html", IDR_KEYBOARD_INDEX},
     {"keyboard/keysets.html", IDR_KEYBOARD_KEYSETS},
     {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
diff --git a/ui/keyboard/resources/elements/kb-keyboard.html b/ui/keyboard/resources/elements/kb-keyboard.html
index bbbe9aa..55fc974 100644
--- a/ui/keyboard/resources/elements/kb-keyboard.html
+++ b/ui/keyboard/resources/elements/kb-keyboard.html
@@ -133,7 +133,7 @@
         switch(char) {
           case 'Invalid':
             return;
-          case 'Mic':
+          case 'Microphone':
             this.voiceInput_.onDown();
             return;
           case '.':
diff --git a/ui/keyboard/resources/images/mic-green.svg b/ui/keyboard/resources/images/microphone-green.svg
index fa33b61..fa33b61 100644
--- a/ui/keyboard/resources/images/mic-green.svg
+++ b/ui/keyboard/resources/images/microphone-green.svg
diff --git a/ui/keyboard/resources/images/mic.svg b/ui/keyboard/resources/images/microphone.svg
index 2b5711c..2b5711c 100644
--- a/ui/keyboard/resources/images/mic.svg
+++ b/ui/keyboard/resources/images/microphone.svg
diff --git a/ui/keyboard/resources/keysets.html b/ui/keyboard/resources/keysets.html
index 2bb6ce9..f611d81 100644
--- a/ui/keyboard/resources/keysets.html
+++ b/ui/keyboard/resources/keysets.html
@@ -21,7 +21,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key accents="A">A</kb-key><kb-key accents="S">S</kb-key><kb-key>D</kb-key>
       <kb-key>F</kb-key><kb-key>G</kb-key><kb-key>H</kb-key><kb-key>J</kb-key>
       <kb-key>K</kb-key><kb-key>L</kb-key>
@@ -147,7 +147,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key accents="a">a</kb-key><kb-key accents="s">s</kb-key>
       <kb-key>d</kb-key><kb-key>f</kb-key><kb-key>g</kb-key><kb-key>h</kb-key>
       <kb-key>j</kb-key><kb-key>k</kb-key><kb-key>l</kb-key>
@@ -274,7 +274,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key>@</kb-key><kb-key>#</kb-key><kb-key accents="dollar">$</kb-key>
       <kb-key accents="percent">%</kb-key><kb-key>&</kb-key>
       <kb-key accents="star">*</kb-key><kb-key accents="slash">/</kb-key>
@@ -385,6 +385,36 @@
         <kb-accent-key>]</kb-accent-key>
       </kb-accent-set>
     </kb-accent-container>
+    <kb-row>
+      <kb-key class="tab dark" char="&#x0009;" align="left">tab</kb-key>
+      <kb-key accents="one">1</kb-key><kb-key accents="two">2</kb-key>
+      <kb-key accents="three">3</kb-key><kb-key accents="four">4</kb-key>
+      <kb-key accents="five">5</kb-key><kb-key>6</kb-key><kb-key accents="seven">7</kb-key>
+      <kb-key>8</kb-key><kb-key>9</kb-key><kb-key accents="zero">0</kb-key>
+      <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
+    </kb-row>
+    <kb-row>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
+      <kb-key>@</kb-key><kb-key>#</kb-key><kb-key accents="dollar">$</kb-key>
+      <kb-key accents="percent">%</kb-key><kb-key>&</kb-key>
+      <kb-key accents="star">*</kb-key><kb-key accents="slash">/</kb-key>
+      <kb-key accents="lparen">(</kb-key><kb-key accents="rparen">)</kb-key>
+      <kb-key class='return dark' char="&#x000A;" align="right">enter</kb-key>
+    </kb-row>
+    <kb-row>
+      <kb-key class="left-more dark" toKeyset="more" char="Invalid" align="left">more</kb-key>
+      <kb-key>:</kb-key><kb-key>;</kb-key><kb-key accents="dash">-</kb-key><kb-key>'</kb-key>
+      <kb-key accents="doublequote">"</kb-key><kb-key accents="excla">!</kb-key>
+      <kb-key accents="quest">?</kb-key><kb-key>,</kb-key><kb-key>.</kb-key>
+      <kb-key class="right-more dark" toKeyset="more" char="Invalid" align="right">more</kb-key>
+    </kb-row>
+    <kb-row>
+      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="left">abc</kb-key>
+      <kb-key class="dotcom dark" align="left">.com</kb-key>
+      <kb-key class="space dark" char=" "></kb-key>
+      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="right">abc</kb-key>
+      <kb-key class="hide dark"></kb-key>
+    </kb-row>
   </kb-keyset>
 
   <kb-keyset id="more">
@@ -396,7 +426,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key>&#x00A3</kb-key><kb-key>&#x00A2</kb-key><kb-key>&#x20AC</kb-key><kb-key>&#x2122</kb-key>
       <kb-key>&#x00A9</kb-key><kb-key>&#x00AE</kb-key><kb-key>\</kb-key><kb-key>[</kb-key>
       <kb-key>]</kb-key>
diff --git a/ui/keyboard/resources/main.css b/ui/keyboard/resources/main.css
index 4cb435b..11d9661 100644
--- a/ui/keyboard/resources/main.css
+++ b/ui/keyboard/resources/main.css
@@ -59,7 +59,7 @@ kb-key.dark {
   -webkit-box-flex: 2.1 !important;
 }
 
-.mic {
+.microphone {
   -webkit-box-flex: 1.5 !important;
 }
 
@@ -102,12 +102,12 @@ kb-key.dark {
   font-size: 70%;
 }
 
-.mic {
-  background-image: url('images/mic.svg');
+.microphone {
+  background-image: url('images/microphone.svg');
 }
 
-.audio .mic {
-  background-image: url('images/mic-green.svg');
+.audio .microphone {
+  background-image: url('images/microphone-green.svg');
 }
 
 .hide {
diff --git a/ui/keyboard/resources/voice_input.js b/ui/keyboard/resources/voice_input.js
index c6a2bb9..2aebba9 100644
--- a/ui/keyboard/resources/voice_input.js
+++ b/ui/keyboard/resources/voice_input.js
@@ -26,7 +26,7 @@ VoiceInput.prototype = {
   },
 
   /**
-   * Speech recognition started. Change mic key's icon.
+   * Speech recognition started. Change microphone key's icon.
    */
   onStartHandler: function() {
     this.recognizing_ = true;
@@ -59,7 +59,7 @@ VoiceInput.prototype = {
   },
 
   /**
-   * Speech recognition ended. Reset mic key's icon.
+   * Speech recognition ended. Reset microphone key's icon.
    */
   onEndHandler: function() {
     if (this.keyboard_.classList.contains('audio'))
diff --git a/ui/keyboard/resources/webui/keysets.html b/ui/keyboard/resources/webui/keysets.html
index d0efce7..be38411 100644
--- a/ui/keyboard/resources/webui/keysets.html
+++ b/ui/keyboard/resources/webui/keysets.html
@@ -26,7 +26,7 @@
     </kb-row>
     <kb-row>
       <kb-key class="symbol dark" toKeyset="symbol" char="Invalid">?123</kb-key>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key class="dark">,</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
       <kb-key class="dark">.</kb-key>
@@ -55,7 +55,7 @@
     </kb-row>
     <kb-row>
       <kb-key class="symbol dark" toKeyset="symbol" char="Invalid">?123</kb-key>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key class="dark">,</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
       <kb-key class="dark">.</kb-key>
@@ -102,7 +102,7 @@
     </kb-row>
     <kb-row>
       <kb-key class="symbol dark" toKeyset="lower" char="Invalid">abc</kb-key>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key class="dark">,</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
       <kb-key class="dark">.</kb-key>
@@ -130,7 +130,7 @@
     </kb-row>
     <kb-row>
       <kb-key class="symbol dark" toKeyset="lower" char="Invalid">abc</kb-key>
-      <kb-key class="mic dark" char="Mic"></kb-key>
+      <kb-key class="microphone dark" char="Microphone"></kb-key>
       <kb-key class="dark">,</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
       <kb-key class="dark">.</kb-key>