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

Side by Side Diff: chrome/browser/ui/ash/palette_delegate_chromeos.cc

Issue 2824703006: Add MetalayerMode to the palette. (Closed)
Patch Set: Fixed copyright year Created 3 years, 8 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ui/ash/palette_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
6 6
7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
8 #include "ash/aura/shell_port_classic.h" 8 #include "ash/aura/shell_port_classic.h"
9 #include "ash/screenshot_delegate.h" 9 #include "ash/screenshot_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 auto* screenshot_delegate = ash::ShellPortClassic::Get() 172 auto* screenshot_delegate = ash::ShellPortClassic::Get()
173 ->accelerator_controller_delegate() 173 ->accelerator_controller_delegate()
174 ->screenshot_delegate(); 174 ->screenshot_delegate();
175 screenshot_delegate->HandleTakeScreenshotForAllRootWindows(); 175 screenshot_delegate->HandleTakeScreenshotForAllRootWindows();
176 } 176 }
177 177
178 void PaletteDelegateChromeOS::TakePartialScreenshot(const base::Closure& done) { 178 void PaletteDelegateChromeOS::TakePartialScreenshot(const base::Closure& done) {
179 auto* screenshot_controller = ash::Shell::Get()->screenshot_controller(); 179 auto* screenshot_controller = ash::Shell::Get()->screenshot_controller();
180 180
181 ash::ScreenshotDelegate* screenshot_delegate; 181 ash::ScreenshotDelegate* screenshot_delegate;
182 if (arc::ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled() && 182 if (IsMetalayerSupported()) {
183 arc::IsArcAllowedForProfile(profile_)) {
184 // This is an experimental mode. It will be either taken out or grow 183 // This is an experimental mode. It will be either taken out or grow
185 // into a separate tool next to "Capture region". 184 // into a separate tool next to "Capture region".
186 if (!voice_interaction_screenshot_delegate_) { 185 if (!voice_interaction_screenshot_delegate_) {
187 voice_interaction_screenshot_delegate_ = 186 voice_interaction_screenshot_delegate_ =
188 base::MakeUnique<VoiceInteractionScreenshotDelegate>(); 187 base::MakeUnique<VoiceInteractionScreenshotDelegate>();
189 } 188 }
190 screenshot_delegate = voice_interaction_screenshot_delegate_.get(); 189 screenshot_delegate = voice_interaction_screenshot_delegate_.get();
191 } else { 190 } else {
192 screenshot_delegate = ash::ShellPortClassic::Get() 191 screenshot_delegate = ash::ShellPortClassic::Get()
193 ->accelerator_controller_delegate() 192 ->accelerator_controller_delegate()
194 ->screenshot_delegate(); 193 ->screenshot_delegate();
195 } 194 }
196 195
197 screenshot_controller->set_pen_events_only(true); 196 screenshot_controller->set_pen_events_only(true);
198 screenshot_controller->StartPartialScreenshotSession( 197 screenshot_controller->StartPartialScreenshotSession(
199 screenshot_delegate, false /* draw_overlay_immediately */); 198 screenshot_delegate, false /* draw_overlay_immediately */);
200 screenshot_controller->set_on_screenshot_session_done( 199 screenshot_controller->set_on_screenshot_session_done(
201 base::Bind(&PaletteDelegateChromeOS::OnPartialScreenshotDone, 200 base::Bind(&PaletteDelegateChromeOS::OnPartialScreenshotDone,
202 weak_factory_.GetWeakPtr(), done)); 201 weak_factory_.GetWeakPtr(), done));
203 } 202 }
204 203
205 void PaletteDelegateChromeOS::CancelPartialScreenshot() { 204 void PaletteDelegateChromeOS::CancelPartialScreenshot() {
206 ash::Shell::Get()->screenshot_controller()->CancelScreenshotSession(); 205 ash::Shell::Get()->screenshot_controller()->CancelScreenshotSession();
207 } 206 }
208 207
208 bool PaletteDelegateChromeOS::IsMetalayerSupported() {
209 if (!arc::IsArcAllowedForProfile(profile_))
210 return false;
211
212 arc::ArcVoiceInteractionFrameworkService* service =
213 arc::ArcServiceManager::Get()
214 ->GetService<arc::ArcVoiceInteractionFrameworkService>();
215 return service && service->IsMetalayerSupported();
216 }
217
218 void PaletteDelegateChromeOS::ShowMetalayer(const base::Closure& closed) {
219 arc::ArcVoiceInteractionFrameworkService* service =
220 arc::ArcServiceManager::Get()
221 ->GetService<arc::ArcVoiceInteractionFrameworkService>();
222 if (!service) {
223 if (!closed.is_null())
224 closed.Run();
225 return;
226 }
227 service->ShowMetalayer(closed);
228 }
229
230 void PaletteDelegateChromeOS::HideMetalayer() {
231 arc::ArcVoiceInteractionFrameworkService* service =
232 arc::ArcServiceManager::Get()
233 ->GetService<arc::ArcVoiceInteractionFrameworkService>();
234 if (!service)
235 return;
236 service->HideMetalayer();
237 }
238
209 } // namespace chromeos 239 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/palette_delegate_chromeos.h ('k') | components/arc/common/voice_interaction_framework.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698