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

Unified Diff: ash/common/system/tray/system_tray.cc

Issue 2368363002: mustash: Fix crash when opening system tray menu (Closed)
Patch Set: Created 4 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray.cc
diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
index 7759427adf228122e38b45f8361b8f95b0b68efe..06c41736db80c751fe9b728fd7b3d5ee54f8ad6a 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -799,6 +799,9 @@ void SystemTray::ActivateAndStartNavigation(const ui::KeyEvent& key_event) {
void SystemTray::CreateKeyEventWatcher() {
key_event_watcher_ = WmShell::Get()->CreateKeyEventWatcher();
+ // mustash does not yet support KeyEventWatcher. http://crbug.com/649600.
+ if (!key_event_watcher_)
+ return;
key_event_watcher_->AddKeyEventCallback(
ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE),
base::Bind(&SystemTray::CloseBubble, base::Unretained(this)));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698