| Index: ash/wm/gestures/tray_gesture_handler.cc
|
| diff --git a/ash/wm/gestures/tray_gesture_handler.cc b/ash/wm/gestures/tray_gesture_handler.cc
|
| index 1a8f2ea543e9f53bfa1f87199282c3066b200cac..5eabccb9fb2b0d30b12bec8a9b893b1bbacc132b 100644
|
| --- a/ash/wm/gestures/tray_gesture_handler.cc
|
| +++ b/ash/wm/gestures/tray_gesture_handler.cc
|
| @@ -21,7 +21,8 @@ namespace internal {
|
| TrayGestureHandler::TrayGestureHandler()
|
| : widget_(NULL),
|
| gesture_drag_amount_(0) {
|
| - SystemTray* tray = Shell::GetInstance()->system_tray();
|
| + // TODO(oshima): Support multiple display case.
|
| + SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray();
|
| tray->ShowDefaultView(BUBBLE_CREATE_NEW);
|
| SystemTrayBubble* bubble = tray->GetSystemBubble();
|
| if (!bubble)
|
| @@ -93,7 +94,7 @@ void TrayGestureHandler::CompleteGestureDrag(const ui::GestureEvent& event) {
|
| widget_->Close();
|
| } else {
|
| SystemTrayBubble* bubble =
|
| - Shell::GetInstance()->system_tray()->GetSystemBubble();
|
| + Shell::GetInstance()->GetPrimarySystemTray()->GetSystemBubble();
|
| if (bubble)
|
| bubble->bubble_view()->set_gesture_dragging(false);
|
| }
|
|
|