ui/keyboard/keyboard_ui_controller.cc - Issue 43593003: Add layout switcher for virtual keyboard.

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

Issue 43593003: Add layout switcher for virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix keyboard tests. Created 7 years, 1 month 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

« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | ui/keyboard/keyboard_util.cc » ('j') | no next file with comments »

OLD	NEW
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"

(...skipping 20 matching lines...) Expand all Loading...
31 source->AddResourcePath("elements/kb-key-base.html",	31 source->AddResourcePath("elements/kb-key-base.html",

32 IDR_KEYBOARD_ELEMENTS_KEY_BASE);	32 IDR_KEYBOARD_ELEMENTS_KEY_BASE);

33 source->AddResourcePath("elements/kb-key-codes.html",	33 source->AddResourcePath("elements/kb-key-codes.html",

34 IDR_KEYBOARD_ELEMENTS_KEY_CODES);	34 IDR_KEYBOARD_ELEMENTS_KEY_CODES);

35 source->AddResourcePath("elements/kb-keyboard.html",	35 source->AddResourcePath("elements/kb-keyboard.html",

36 IDR_KEYBOARD_ELEMENTS_KEYBOARD);	36 IDR_KEYBOARD_ELEMENTS_KEYBOARD);

37 source->AddResourcePath("elements/kb-keyset.html",	37 source->AddResourcePath("elements/kb-keyset.html",

38 IDR_KEYBOARD_ELEMENTS_KEYSET);	38 IDR_KEYBOARD_ELEMENTS_KEYSET);

39 source->AddResourcePath("elements/kb-modifier-key.html",	39 source->AddResourcePath("elements/kb-modifier-key.html",

40 IDR_KEYBOARD_ELEMENTS_MODIFIER_KEY);	40 IDR_KEYBOARD_ELEMENTS_MODIFIER_KEY);

	41 source->AddResourcePath("elements/kb-options-menu.html",

	42 IDR_KEYBOARD_ELEMENTS_OPTIONS_MENU);

41 source->AddResourcePath("elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW);	43 source->AddResourcePath("elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW);

42 source->AddResourcePath("elements/kb-shift-key.html",	44 source->AddResourcePath("elements/kb-shift-key.html",

43 IDR_KEYBOARD_ELEMENTS_SHIFT_KEY);	45 IDR_KEYBOARD_ELEMENTS_SHIFT_KEY);

44 source->AddResourcePath("images/back.svg",	46 source->AddResourcePath("images/back.svg",

45 IDR_KEYBOARD_IMAGES_BACK);	47 IDR_KEYBOARD_IMAGES_BACK);

46 source->AddResourcePath("images/brightness-down.svg",	48 source->AddResourcePath("images/brightness-down.svg",

47 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN);	49 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN);

48 source->AddResourcePath("images/brightness-up.svg",	50 source->AddResourcePath("images/brightness-up.svg",

49 IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP);	51 IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP);

50 source->AddResourcePath("images/change-window.svg",	52 source->AddResourcePath("images/change-window.svg",

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 web_ui->GetWebContents()->GetBrowserContext();	105 web_ui->GetWebContents()->GetBrowserContext();

104 web_ui->AddMessageHandler(new KeyboardUIHandler());	106 web_ui->AddMessageHandler(new KeyboardUIHandler());

105 content::WebUIDataSource::Add(	107 content::WebUIDataSource::Add(

106 browser_context,	108 browser_context,

107 CreateKeyboardUIDataSource());	109 CreateKeyboardUIDataSource());

108 }	110 }

109	111

110 KeyboardUIController::~KeyboardUIController() {}	112 KeyboardUIController::~KeyboardUIController() {}

111	113

112 } // namespace keyboard	114 } // namespace keyboard

OLD	NEW