Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

Side by Side Diff: ui/keyboard/keyboard_ui_controller.cc

Issue 15176004: Web Component Virtual Keyboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/keyboard/keyboard_ui_controller.h" 5 #include "ui/keyboard/keyboard_ui_controller.h"
6 6
7 #include "content/public/browser/browser_context.h" 7 #include "content/public/browser/browser_context.h"
8 #include "content/public/browser/web_contents.h" 8 #include "content/public/browser/web_contents.h"
9 #include "content/public/browser/web_ui.h" 9 #include "content/public/browser/web_ui.h"
10 #include "content/public/browser/web_ui_data_source.h" 10 #include "content/public/browser/web_ui_data_source.h"
11 #include "grit/keyboard_resources.h" 11 #include "grit/keyboard_resources.h"
12 #include "ui/keyboard/keyboard_constants.h" 12 #include "ui/keyboard/keyboard_constants.h"
13 #include "ui/keyboard/keyboard_ui_handler.h" 13 #include "ui/keyboard/keyboard_ui_handler.h"
14 14
15 namespace { 15 namespace {
16 16
17 content::WebUIDataSource* CreateKeyboardUIDataSource() { 17 content::WebUIDataSource* CreateKeyboardUIDataSource() {
18 content::WebUIDataSource* source = 18 content::WebUIDataSource* source =
19 content::WebUIDataSource::Create(keyboard::kKeyboardWebUIHost); 19 content::WebUIDataSource::Create(keyboard::kKeyboardWebUIHost);
20 20
21 source->SetDefaultResource(IDR_KEYBOARD_INDEX); 21 source->SetDefaultResource(IDR_KEYBOARD_INDEX);
22 22
23 source->AddResourcePath("common.js", IDR_KEYBOARD_COMMON_JS); 23 source->AddResourcePath("elements/kb-key.html", IDR_KEYBOARD_ELEMENTS_KEY);
24 source->AddResourcePath("images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON); 24 source->AddResourcePath("elements/kb-keyboard.html",
25 source->AddResourcePath("images/del.svg", IDR_KEYBOARD_IMAGES_DEL); 25 IDR_KEYBOARD_ELEMENTS_KEYBOARD);
26 source->AddResourcePath("images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD); 26 source->AddResourcePath("elements/kb-keyset.html",
27 IDR_KEYBOARD_ELEMENTS_KEYSET);
28 source->AddResourcePath("elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW);
27 source->AddResourcePath("images/mic.svg", IDR_KEYBOARD_IMAGES_MIC); 29 source->AddResourcePath("images/mic.svg", IDR_KEYBOARD_IMAGES_MIC);
28 source->AddResourcePath("images/ret.svg", IDR_KEYBOARD_IMAGES_RET); 30 source->AddResourcePath("images/mic-green.svg",
29 source->AddResourcePath("images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT); 31 IDR_KEYBOARD_IMAGES_MIC_GREEN);
30 source->AddResourcePath("images/shift_down.svg",
31 IDR_KEYBOARD_IMAGES_SHIFT_DOWN);
32 source->AddResourcePath("images/tab.svg", IDR_KEYBOARD_IMAGES_TAB);
33 source->AddResourcePath("main.js", IDR_KEYBOARD_MAIN_JS); 32 source->AddResourcePath("main.js", IDR_KEYBOARD_MAIN_JS);
33 source->AddResourcePath("polymer.min.js", IDR_KEYBOARD_POLYMER);
34 source->AddResourcePath("voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS);
34 35
35 // These files are specific to the WebUI version 36 // These files are specific to the WebUI version
36 source->AddResourcePath("layout_us.js", IDR_KEYBOARD_WEBUI_LAYOUT_US_JS); 37 source->AddResourcePath("api_adapter.js", IDR_KEYBOARD_WEBUI_API_ADAPTER_JS);
38 source->AddResourcePath("constants.js", IDR_KEYBOARD_WEBUI_CONSTANTS_JS);
39 source->AddResourcePath("keysets.html", IDR_KEYBOARD_WEBUI_KEYSETS);
37 source->AddResourcePath("main.css", IDR_KEYBOARD_WEBUI_MAIN_CSS); 40 source->AddResourcePath("main.css", IDR_KEYBOARD_WEBUI_MAIN_CSS);
38 source->AddResourcePath("api_adapter.js", IDR_KEYBOARD_WEBUI_API_ADAPTER_JS);
39 41
40 return source; 42 return source;
41 } 43 }
42 44
43 } // namespace 45 } // namespace
44 46
45 namespace keyboard { 47 namespace keyboard {
46 48
47 KeyboardUIController::KeyboardUIController(content::WebUI* web_ui) 49 KeyboardUIController::KeyboardUIController(content::WebUI* web_ui)
48 : WebUIController(web_ui) { 50 : WebUIController(web_ui) {
49 content::BrowserContext* browser_context = 51 content::BrowserContext* browser_context =
50 web_ui->GetWebContents()->GetBrowserContext(); 52 web_ui->GetWebContents()->GetBrowserContext();
51 web_ui->AddMessageHandler(new KeyboardUIHandler()); 53 web_ui->AddMessageHandler(new KeyboardUIHandler());
52 content::WebUIDataSource::Add( 54 content::WebUIDataSource::Add(
53 browser_context, 55 browser_context,
54 CreateKeyboardUIDataSource()); 56 CreateKeyboardUIDataSource());
55 } 57 }
56 58
57 KeyboardUIController::~KeyboardUIController() {} 59 KeyboardUIController::~KeyboardUIController() {}
58 60
59 } // namespace keyboard 61 } // namespace keyboard
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698