ui/keyboard/keyboard_ui_controller.cc - Issue 59813004: Adds support for the search key in the Virtual Keyboard.

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

Issue 59813004: Adds support for the search key in the Virtual Keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« 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 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 source->AddResourcePath("images/microphone.svg",	62 source->AddResourcePath("images/microphone.svg",

63 IDR_KEYBOARD_IMAGES_MICROPHONE);	63 IDR_KEYBOARD_IMAGES_MICROPHONE);

64 source->AddResourcePath("images/microphone-green.svg",	64 source->AddResourcePath("images/microphone-green.svg",

65 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN);	65 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN);

66 source->AddResourcePath("images/mute.svg",	66 source->AddResourcePath("images/mute.svg",

67 IDR_KEYBOARD_IMAGES_MUTE);	67 IDR_KEYBOARD_IMAGES_MUTE);

68 source->AddResourcePath("images/reload.svg",	68 source->AddResourcePath("images/reload.svg",

69 IDR_KEYBOARD_IMAGES_RELOAD);	69 IDR_KEYBOARD_IMAGES_RELOAD);

70 source->AddResourcePath("images/right.svg",	70 source->AddResourcePath("images/right.svg",

71 IDR_KEYBOARD_IMAGES_RIGHT);	71 IDR_KEYBOARD_IMAGES_RIGHT);

	72 source->AddResourcePath("images/search.svg",

	73 IDR_KEYBOARD_IMAGES_SEARCH);

72 source->AddResourcePath("images/shutdown.svg",	74 source->AddResourcePath("images/shutdown.svg",

73 IDR_KEYBOARD_IMAGES_SHUTDOWN);	75 IDR_KEYBOARD_IMAGES_SHUTDOWN);

74 source->AddResourcePath("images/up.svg",	76 source->AddResourcePath("images/up.svg",

75 IDR_KEYBOARD_IMAGES_UP);	77 IDR_KEYBOARD_IMAGES_UP);

76 source->AddResourcePath("images/volume-down.svg",	78 source->AddResourcePath("images/volume-down.svg",

77 IDR_KEYBOARD_IMAGES_VOLUME_DOWN);	79 IDR_KEYBOARD_IMAGES_VOLUME_DOWN);

78 source->AddResourcePath("images/volume-up.svg",	80 source->AddResourcePath("images/volume-up.svg",

79 IDR_KEYBOARD_IMAGES_VOLUME_UP);	81 IDR_KEYBOARD_IMAGES_VOLUME_UP);

80 source->AddResourcePath("layouts/latin-accents.js",	82 source->AddResourcePath("layouts/latin-accents.js",

81 IDR_KEYBOARD_LAYOUTS_LATIN_ACCENTS);	83 IDR_KEYBOARD_LAYOUTS_LATIN_ACCENTS);

(...skipping 23 matching lines...) Expand all Loading...
105 web_ui->GetWebContents()->GetBrowserContext();	107 web_ui->GetWebContents()->GetBrowserContext();

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

107 content::WebUIDataSource::Add(	109 content::WebUIDataSource::Add(

108 browser_context,	110 browser_context,

109 CreateKeyboardUIDataSource());	111 CreateKeyboardUIDataSource());

110 }	112 }

111	113

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

113	115

114 } // namespace keyboard	116 } // namespace keyboard

OLD	NEW