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

Unified Diff: chrome/browser/ui/ash/palette_delegate_chromeos.cc

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: fix include Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/browser_commands_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/palette_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/palette_delegate_chromeos.cc b/chrome/browser/ui/ash/palette_delegate_chromeos.cc
index 99443ac7fd154f64b01a6a788c493f0b5984e84f..d69e95964a165618fd846d76de6231c3da29d190 100644
--- a/chrome/browser/ui/ash/palette_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/palette_delegate_chromeos.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
+#include "ash/aura/wm_shell_aura.h"
#include "ash/common/system/chromeos/palette/palette_utils.h"
#include "ash/screenshot_delegate.h"
#include "ash/shell.h"
@@ -132,7 +133,7 @@ bool PaletteDelegateChromeOS::ShouldShowPalette() {
}
void PaletteDelegateChromeOS::TakeScreenshot() {
- auto* screenshot_delegate = ash::Shell::GetInstance()
+ auto* screenshot_delegate = ash::WmShellAura::Get()
->accelerator_controller_delegate()
->screenshot_delegate();
screenshot_delegate->HandleTakeScreenshotForAllRootWindows();
@@ -141,7 +142,7 @@ void PaletteDelegateChromeOS::TakeScreenshot() {
void PaletteDelegateChromeOS::TakePartialScreenshot(const base::Closure& done) {
auto* screenshot_controller =
ash::Shell::GetInstance()->screenshot_controller();
- auto* screenshot_delegate = ash::Shell::GetInstance()
+ auto* screenshot_delegate = ash::WmShellAura::Get()
->accelerator_controller_delegate()
->screenshot_delegate();
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/browser_commands_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698