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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 2825383003: Fix stylus tools palette. (Closed)
Patch Set: Load palette_tray all the time. Only check when show it 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/ash_switches.h » ('j') | ash/system/palette/palette_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 4e06455c59a0d117434af3e32157e1a62d03a814..fa650865bac8c93a99039fa40adcb15571bec149 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -16,7 +16,6 @@
#include "ash/media_controller.h"
#include "ash/multi_profile_uma.h"
#include "ash/new_window_controller.h"
-#include "ash/palette_delegate.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
#include "ash/rotator/window_rotation.h"
@@ -519,8 +518,7 @@ void HandleShowStylusTools() {
}
bool CanHandleShowStylusTools() {
- return Shell::Get()->palette_delegate() &&
- Shell::Get()->palette_delegate()->ShouldShowPalette();
+ return palette_utils::ShouldShowPalette();
}
void HandleSuspend() {
« no previous file with comments | « no previous file | ash/ash_switches.h » ('j') | ash/system/palette/palette_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698