Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 (HasMetalayer()) { |
| 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::HasMetalayer() { | |
| 209 if (!arc::IsArcAllowedForProfile(profile_)) | |
|
Luis Héctor Chávez
2017/04/19 15:48:29
Don't we also want to check arc::ArcVoiceInteracti
Vladislav Kaznacheev
2017/04/19 23:42:59
ArcVoiceInteractionFrameworkService instantiation
| |
| 210 return false; | |
| 211 | |
| 212 arc::ArcVoiceInteractionFrameworkService* service = | |
| 213 arc::ArcServiceManager::Get() | |
| 214 ->GetService<arc::ArcVoiceInteractionFrameworkService>(); | |
| 215 return service && service->IsReady(); | |
| 216 } | |
| 217 | |
| 218 void PaletteDelegateChromeOS::ShowMetalayer(const base::Closure& done) { | |
| 219 arc::ArcVoiceInteractionFrameworkService* service = | |
|
Luis Héctor Chávez
2017/04/19 15:48:29
If the container dies just prior to this being cal
Vladislav Kaznacheev
2017/04/19 23:42:59
Replaced DCHECK with closure resolution and return
| |
| 220 arc::ArcServiceManager::Get() | |
| 221 ->GetService<arc::ArcVoiceInteractionFrameworkService>(); | |
| 222 DCHECK(service); | |
| 223 service->ShowMetalayer(done); | |
| 224 } | |
| 225 | |
| 226 void PaletteDelegateChromeOS::HideMetalayer() { | |
| 227 arc::ArcVoiceInteractionFrameworkService* service = | |
| 228 arc::ArcServiceManager::Get() | |
| 229 ->GetService<arc::ArcVoiceInteractionFrameworkService>(); | |
| 230 DCHECK(service); | |
| 231 service->HideMetalayer(); | |
| 232 } | |
| 233 | |
| 209 } // namespace chromeos | 234 } // namespace chromeos |
| OLD | NEW |