| 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)));
|
|
|