[Launcher per display] Removed Shell::status_area_widget(), system_tray()

ash/wm/gestures/tray_gesture_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/gestures/tray_gesture_handler.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
 
 const int kMinBubbleHeight = 13;
 
 namespace ash {
 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)
     return;
   bubble->bubble_view()->set_gesture_dragging(true);
   widget_ = bubble->bubble_view()->GetWidget();
   widget_->AddObserver(this);
 
   gfx::Rect bounds = widget_->GetWindowBoundsInScreen();
   int height_change = bounds.height() - kMinBubbleHeight;
@@ skipping 51 matching lines @@
         event.details().velocity_y() > -kMinThresholdGestureFling)
       should_close = true;
   } else {
     NOTREACHED();
   }
 
   if (should_close) {
     widget_->Close();
   } else {
     SystemTrayBubble* bubble =
-        Shell::GetInstance()->system_tray()->GetSystemBubble();
+        Shell::GetInstance()->GetPrimarySystemTray()->GetSystemBubble();
     if (bubble)
       bubble->bubble_view()->set_gesture_dragging(false);
   }
 }
 
 void TrayGestureHandler::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(widget_, widget);
   widget_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash