Add layouts directory and move all keysets to it

BUG=None

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

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

6 files changed, 11 insertions, 11 deletions

diff --git a/ui/keyboard/keyboard_resources.grd b/ui/keyboard/keyboard_resources.grd
index 6aaef19..638f7aa 100644
--- a/ui/keyboard/keyboard_resources.grd
+++ b/ui/keyboard/keyboard_resources.grd
@@ -29,16 +29,16 @@
       <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" />
       <include name="IDR_KEYBOARD_MAIN_JS" file="resources/main.js" type="BINDATA" />
       <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" file="resources/polymer.min.js" flattenhtml="true" type="BINDATA" />
+      <include name="IDR_KEYBOARD_QWERTY" file="resources/layouts/qwerty.html" type="BINDATA" />
       <include name="IDR_KEYBOARD_VOICE_INPUT_JS" file="resources/voice_input.js" type="BINDATA" />
       <include name="IDR_KEYBOARD_WEBUI_API_ADAPTER_JS" file="resources/webui/api_adapter.js" type="BINDATA" />
       <include name="IDR_KEYBOARD_WEBUI_CONSTANTS_JS" file="resources/webui/constants.js" type="BINDATA" />
-      <include name="IDR_KEYBOARD_WEBUI_KEYSETS" file="resources/webui/keysets.html" type="BINDATA" />
       <include name="IDR_KEYBOARD_WEBUI_MAIN_CSS" file="resources/webui/main.css" type="BINDATA" />
+      <include name="IDR_KEYBOARD_WEBUI_QWERTY" file="resources/layouts/webui_qwerty.html" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/ui/keyboard/keyboard_ui_controller.cc b/ui/keyboard/keyboard_ui_controller.cc
index 7c524fd..ab3dc8a 100644
--- a/ui/keyboard/keyboard_ui_controller.cc
+++ b/ui/keyboard/keyboard_ui_controller.cc
@@ -43,7 +43,7 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() {
   // These files are specific to the WebUI version
   source->AddResourcePath("api_adapter.js", IDR_KEYBOARD_WEBUI_API_ADAPTER_JS);
   source->AddResourcePath("constants.js", IDR_KEYBOARD_WEBUI_CONSTANTS_JS);
-  source->AddResourcePath("keysets.html", IDR_KEYBOARD_WEBUI_KEYSETS);
+  source->AddResourcePath("layouts/qwerty.html", IDR_KEYBOARD_WEBUI_QWERTY);
   source->AddResourcePath("main.css", IDR_KEYBOARD_WEBUI_MAIN_CSS);
 
   return source;
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 85f32f1..cfbbcfb 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -84,7 +84,7 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
     {"keyboard/images/microphone-green.svg",
         IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
     {"keyboard/index.html", IDR_KEYBOARD_INDEX},
-    {"keyboard/keysets.html", IDR_KEYBOARD_KEYSETS},
+    {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_QWERTY},
     {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
     {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
     {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
diff --git a/ui/keyboard/resources/index.html b/ui/keyboard/resources/index.html
index adc36c3..932b506 100644
--- a/ui/keyboard/resources/index.html
+++ b/ui/keyboard/resources/index.html
@@ -20,7 +20,7 @@
     <link rel="import" href="elements/kb-keyboard.html">
     <link rel="import" href="elements/kb-keyset.html">
     <link rel="import" href="elements/kb-row.html">
-    <link id="keysets" rel="import" href="keysets.html">
+    <link id="keysets" rel="import" href="layouts/qwerty.html">
     <!--TODO(stevet): Import 'Open Sans' font. -->
     <script src="main.js"></script>
   </head>
diff --git a/ui/keyboard/resources/keysets.html b/ui/keyboard/resources/layouts/qwerty.html
index f611d81..d613a28 100644
--- a/ui/keyboard/resources/keysets.html
+++ b/ui/keyboard/resources/layouts/qwerty.html
@@ -1,5 +1,5 @@
 <!--
-  -- Copyright (c) 2013 The Chromium Authors. All rights reserved.
+  -- Copyright 2013 The Chromium Authors. All rights reserved.
   -- Use of this source code is governed by a BSD-style license that can be
   -- found in the LICENSE file.
   -->
diff --git a/ui/keyboard/resources/webui/keysets.html b/ui/keyboard/resources/layouts/webui_qwerty.html
index be38411..434a085 100644
--- a/ui/keyboard/resources/webui/keysets.html
+++ b/ui/keyboard/resources/layouts/webui_qwerty.html
@@ -1,5 +1,5 @@
 <!--
-  -- Copyright (c) 2013 The Chromium Authors. All rights reserved.
+  -- Copyright 2013 The Chromium Authors. All rights reserved.
   -- Use of this source code is governed by a BSD-style license that can be
   -- found in the LICENSE file.
   -->
@@ -26,7 +26,7 @@
     </kb-row>
     <kb-row>
       <kb-key class="symbol dark" toKeyset="symbol" char="Invalid">?123</kb-key>
-      <kb-key class="microphone dark" char="Microphone"></kb-key>
+      <kb-key class="mic dark" char="Mic"></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="microphone dark" char="Microphone"></kb-key>
+      <kb-key class="mic dark" char="Mic"></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="microphone dark" char="Microphone"></kb-key>
+      <kb-key class="mic dark" char="Mic"></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="microphone dark" char="Microphone"></kb-key>
+      <kb-key class="mic dark" char="Mic"></kb-key>
       <kb-key class="dark">,</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
       <kb-key class="dark">.</kb-key>