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

Unified Diff: ash/wm/gestures/tray_gesture_handler.cc

Issue 11476033: [Launcher per display] Removed Shell::status_area_widget(), system_tray() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix style Created 8 years 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 | « ash/system/tray_update.cc ('k') | ash/wm/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « ash/system/tray_update.cc ('k') | ash/wm/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698