OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/chromeos/arc/voice_interaction/arc_voice_interaction_fr amework_service.h" | 5 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr amework_service.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/accelerators/accelerator_controller.h" | 10 #include "ash/accelerators/accelerator_controller.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 void ArcVoiceInteractionFrameworkService::OnInstanceReady() { | 60 void ArcVoiceInteractionFrameworkService::OnInstanceReady() { |
61 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 61 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
62 mojom::VoiceInteractionFrameworkInstance* framework_instance = | 62 mojom::VoiceInteractionFrameworkInstance* framework_instance = |
63 ARC_GET_INSTANCE_FOR_METHOD( | 63 ARC_GET_INSTANCE_FOR_METHOD( |
64 arc_bridge_service()->voice_interaction_framework(), Init); | 64 arc_bridge_service()->voice_interaction_framework(), Init); |
65 DCHECK(framework_instance); | 65 DCHECK(framework_instance); |
66 framework_instance->Init(binding_.CreateInterfacePtrAndBind()); | 66 framework_instance->Init(binding_.CreateInterfacePtrAndBind()); |
67 | 67 |
68 ash::Shell::Get()->accelerator_controller()->Register( | 68 ash::Shell::Get()->accelerator_controller()->Register( |
69 {ui::Accelerator(ui::VKEY_A, ui::EF_COMMAND_DOWN)}, this); | 69 {ui::Accelerator(ui::VKEY_A, ui::EF_COMMAND_DOWN)}, this); |
70 ash::Shell::Get()->accelerator_controller()->Register( | |
71 {ui::Accelerator(ui::VKEY_A, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN)}, | |
72 this); | |
70 } | 73 } |
71 | 74 |
72 void ArcVoiceInteractionFrameworkService::OnInstanceClosed() { | 75 void ArcVoiceInteractionFrameworkService::OnInstanceClosed() { |
73 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 76 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
74 ash::Shell::Get()->accelerator_controller()->UnregisterAll(this); | 77 ash::Shell::Get()->accelerator_controller()->UnregisterAll(this); |
75 } | 78 } |
76 | 79 |
77 bool ArcVoiceInteractionFrameworkService::AcceleratorPressed( | 80 bool ArcVoiceInteractionFrameworkService::AcceleratorPressed( |
78 const ui::Accelerator& accelerator) { | 81 const ui::Accelerator& accelerator) { |
79 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 82 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
80 mojom::VoiceInteractionFrameworkInstance* framework_instance = | 83 |
81 ARC_GET_INSTANCE_FOR_METHOD( | 84 if (accelerator.modifiers() & ui::EF_SHIFT_DOWN) { |
Luis Héctor Chávez
2017/04/11 16:11:16
nit: accelerator.IsShiftDown()
Vladislav Kaznacheev
2017/04/11 18:59:33
Done.
| |
82 arc_bridge_service()->voice_interaction_framework(), | 85 mojom::VoiceInteractionFrameworkInstance* framework_instance = |
83 StartVoiceInteractionSession); | 86 ARC_GET_INSTANCE_FOR_METHOD( |
84 DCHECK(framework_instance); | 87 arc_bridge_service()->voice_interaction_framework(), |
85 framework_instance->StartVoiceInteractionSession(); | 88 ToggleMetalayer); |
89 DCHECK(framework_instance); | |
90 framework_instance->ToggleMetalayer(); | |
91 } else { | |
92 mojom::VoiceInteractionFrameworkInstance* framework_instance = | |
93 ARC_GET_INSTANCE_FOR_METHOD( | |
94 arc_bridge_service()->voice_interaction_framework(), | |
95 StartVoiceInteractionSession); | |
96 DCHECK(framework_instance); | |
97 framework_instance->StartVoiceInteractionSession(); | |
98 } | |
99 | |
86 return true; | 100 return true; |
87 } | 101 } |
88 | 102 |
89 bool ArcVoiceInteractionFrameworkService::CanHandleAccelerators() const { | 103 bool ArcVoiceInteractionFrameworkService::CanHandleAccelerators() const { |
90 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 104 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
91 return true; | 105 return true; |
92 } | 106 } |
93 | 107 |
94 void ArcVoiceInteractionFrameworkService::CaptureFocusedWindow( | 108 void ArcVoiceInteractionFrameworkService::CaptureFocusedWindow( |
95 const CaptureFocusedWindowCallback& callback) { | 109 const CaptureFocusedWindowCallback& callback) { |
96 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 110 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
97 aura::Window* window = | 111 aura::Window* window = |
98 ash::Shell::Get()->activation_client()->GetActiveWindow(); | 112 ash::Shell::Get()->activation_client()->GetActiveWindow(); |
99 | 113 |
100 if (window == nullptr) { | 114 if (window == nullptr) { |
101 callback.Run(std::vector<uint8_t>{}); | 115 callback.Run(std::vector<uint8_t>{}); |
102 return; | 116 return; |
103 } | 117 } |
104 ui::GrabWindowSnapshotAsyncPNG(window, gfx::Rect(window->bounds().size()), | 118 ui::GrabWindowSnapshotAsyncPNG(window, gfx::Rect(window->bounds().size()), |
105 base::CreateTaskRunnerWithTraits( | 119 base::CreateTaskRunnerWithTraits( |
106 base::TaskTraits().MayBlock().WithPriority( | 120 base::TaskTraits().MayBlock().WithPriority( |
107 base::TaskPriority::USER_BLOCKING)), | 121 base::TaskPriority::USER_BLOCKING)), |
108 base::Bind(&ScreenshotCallback, callback)); | 122 base::Bind(&ScreenshotCallback, callback)); |
109 } | 123 } |
110 | 124 |
111 } // namespace arc | 125 } // namespace arc |
OLD | NEW |