| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/tray/media_security/multi_profile_media_tray_item.h" | 5 #include "ash/system/tray/media_security/multi_profile_media_tray_item.h" |
| 6 | 6 |
| 7 #include "ash/ash_view_ids.h" | 7 #include "ash/ash_view_ids.h" |
| 8 #include "ash/media_delegate.h" | 8 #include "ash/media_delegate.h" |
| 9 #include "ash/session/session_state_delegate.h" | 9 #include "ash/session/session_state_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 } // namespace tray | 63 } // namespace tray |
| 64 | 64 |
| 65 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) | 65 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) |
| 66 : SystemTrayItem(system_tray), tray_view_(NULL) { | 66 : SystemTrayItem(system_tray), tray_view_(NULL) { |
| 67 } | 67 } |
| 68 | 68 |
| 69 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() { | 69 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() { |
| 70 } | 70 } |
| 71 | 71 |
| 72 views::View* MultiProfileMediaTrayItem::CreateTrayView( | 72 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { |
| 73 user::LoginStatus status) { | |
| 74 tray_view_ = new tray::MultiProfileMediaTrayView(this); | 73 tray_view_ = new tray::MultiProfileMediaTrayView(this); |
| 75 return tray_view_; | 74 return tray_view_; |
| 76 } | 75 } |
| 77 | 76 |
| 78 void MultiProfileMediaTrayItem::DestroyTrayView() { | 77 void MultiProfileMediaTrayItem::DestroyTrayView() { |
| 79 tray_view_ = NULL; | 78 tray_view_ = NULL; |
| 80 } | 79 } |
| 81 | 80 |
| 82 } // namespace ash | 81 } // namespace ash |
| OLD | NEW |