| Index: ash/common/system/tray/system_tray.h
|
| diff --git a/ash/common/system/tray/system_tray.h b/ash/common/system/tray/system_tray.h
|
| index 5ded10bd9feea224e5cbc460b4bb939876836c14..ea5a4604b22a5dfbbf7c63d15eb3a9d5f11888d8 100644
|
| --- a/ash/common/system/tray/system_tray.h
|
| +++ b/ash/common/system/tray/system_tray.h
|
| @@ -238,9 +238,6 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
|
| ScreenTrayItem* screen_capture_tray_item_; // not owned
|
| ScreenTrayItem* screen_share_tray_item_; // not owned
|
|
|
| - // TODO(oshima): Remove this when crbug.com/651242 is fixed.
|
| - bool activating_ = false;
|
| -
|
| std::unique_ptr<KeyEventWatcher> key_event_watcher_;
|
|
|
| std::unique_ptr<ActivationObserver> activation_observer_;
|
|
|