OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_
keyboard_delegate.h" | 5 #include "chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_
keyboard_delegate.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/metrics/histogram_macros.h" | 14 #include "base/metrics/histogram_macros.h" |
| 15 #include "base/metrics/user_metrics.h" |
15 #include "base/metrics/user_metrics_action.h" | 16 #include "base/metrics/user_metrics_action.h" |
16 #include "base/strings/string16.h" | 17 #include "base/strings/string16.h" |
17 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 18 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
18 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 19 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
19 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
20 #include "chrome/browser/ui/chrome_pages.h" | 21 #include "chrome/browser/ui/chrome_pages.h" |
21 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
22 #include "components/user_manager/user_manager.h" | 23 #include "components/user_manager/user_manager.h" |
23 #include "content/public/browser/user_metrics.h" | |
24 #include "extensions/common/api/virtual_keyboard_private.h" | 24 #include "extensions/common/api/virtual_keyboard_private.h" |
25 #include "media/audio/audio_system.h" | 25 #include "media/audio/audio_system.h" |
26 #include "ui/aura/window_tree_host.h" | 26 #include "ui/aura/window_tree_host.h" |
27 #include "ui/keyboard/keyboard_controller.h" | 27 #include "ui/keyboard/keyboard_controller.h" |
28 #include "ui/keyboard/keyboard_switches.h" | 28 #include "ui/keyboard/keyboard_switches.h" |
29 #include "ui/keyboard/keyboard_util.h" | 29 #include "ui/keyboard/keyboard_util.h" |
30 | 30 |
31 namespace keyboard_api = extensions::api::virtual_keyboard_private; | 31 namespace keyboard_api = extensions::api::virtual_keyboard_private; |
32 | 32 |
33 namespace { | 33 namespace { |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 const std::string& key_name, | 156 const std::string& key_name, |
157 int modifiers) { | 157 int modifiers) { |
158 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 158 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
159 aura::Window* window = GetKeyboardContainer(); | 159 aura::Window* window = GetKeyboardContainer(); |
160 return window && keyboard::SendKeyEvent(type, char_value, key_code, key_name, | 160 return window && keyboard::SendKeyEvent(type, char_value, key_code, key_name, |
161 modifiers, window->GetHost()); | 161 modifiers, window->GetHost()); |
162 } | 162 } |
163 | 163 |
164 bool ChromeVirtualKeyboardDelegate::ShowLanguageSettings() { | 164 bool ChromeVirtualKeyboardDelegate::ShowLanguageSettings() { |
165 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 165 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
166 content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog")); | 166 base::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog")); |
167 chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(), | 167 chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(), |
168 chrome::kLanguageOptionsSubPage); | 168 chrome::kLanguageOptionsSubPage); |
169 return true; | 169 return true; |
170 } | 170 } |
171 | 171 |
172 bool ChromeVirtualKeyboardDelegate::SetVirtualKeyboardMode(int mode_enum) { | 172 bool ChromeVirtualKeyboardDelegate::SetVirtualKeyboardMode(int mode_enum) { |
173 keyboard::KeyboardMode keyboard_mode = | 173 keyboard::KeyboardMode keyboard_mode = |
174 getKeyboardModeEnum(static_cast<keyboard_api::KeyboardMode>(mode_enum)); | 174 getKeyboardModeEnum(static_cast<keyboard_api::KeyboardMode>(mode_enum)); |
175 keyboard::KeyboardController* controller = | 175 keyboard::KeyboardController* controller = |
176 keyboard::KeyboardController::GetInstance(); | 176 keyboard::KeyboardController::GetInstance(); |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 "gestureediting", keyboard::IsGestureEditingEnabled())); | 223 "gestureediting", keyboard::IsGestureEditingEnabled())); |
224 features->AppendString(GenerateFeatureFlag( | 224 features->AppendString(GenerateFeatureFlag( |
225 "voiceinput", has_input_devices && keyboard::IsVoiceInputEnabled())); | 225 "voiceinput", has_input_devices && keyboard::IsVoiceInputEnabled())); |
226 features->AppendString(GenerateFeatureFlag( | 226 features->AppendString(GenerateFeatureFlag( |
227 "experimental", keyboard::IsExperimentalInputViewEnabled())); | 227 "experimental", keyboard::IsExperimentalInputViewEnabled())); |
228 results->Set("features", std::move(features)); | 228 results->Set("features", std::move(features)); |
229 std::move(on_settings_callback).Run(std::move(results)); | 229 std::move(on_settings_callback).Run(std::move(results)); |
230 } | 230 } |
231 | 231 |
232 } // namespace extensions | 232 } // namespace extensions |
OLD | NEW |