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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge 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
Index: ash/common/system/chromeos/palette/palette_tray.cc
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
index 113b02f44aff4e9fde09de5c863849756504e154..4fc29227756af3733883ae509cca36df7215bd8e 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -288,7 +288,7 @@ void PaletteTray::OnTouchscreenDeviceConfigurationChanged() {
}
void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
- PaletteDelegate* palette_delegate = WmShell::Get()->palette_delegate();
+ PaletteDelegate* palette_delegate = Shell::GetInstance()->palette_delegate();
// Don't do anything if the palette should not be shown or if the user has
// disabled it all-together.
@@ -400,7 +400,7 @@ void PaletteTray::AnchorUpdated() {
}
void PaletteTray::Initialize() {
- PaletteDelegate* delegate = WmShell::Get()->palette_delegate();
+ PaletteDelegate* delegate = Shell::GetInstance()->palette_delegate();
// |delegate| can be null in tests.
if (!delegate)
return;

Powered by Google App Engine
This is Rietveld 408576698