| 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/common/system/chromeos/media_security/multi_profile_media_tray_ite
m.h" | 5 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_ite
m.h" |
| 6 | 6 |
| 7 #include "ash/common/ash_view_ids.h" | 7 #include "ash/common/ash_view_ids.h" |
| 8 #include "ash/common/media_delegate.h" | 8 #include "ash/common/media_delegate.h" |
| 9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
| 10 #include "ash/common/system/chromeos/media_security/media_capture_observer.h" | 10 #include "ash/common/system/chromeos/media_security/media_capture_observer.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 SetVisible(false); | 55 SetVisible(false); |
| 56 } | 56 } |
| 57 | 57 |
| 58 private: | 58 private: |
| 59 DISALLOW_COPY_AND_ASSIGN(MultiProfileMediaTrayView); | 59 DISALLOW_COPY_AND_ASSIGN(MultiProfileMediaTrayView); |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 } // namespace tray | 62 } // namespace tray |
| 63 | 63 |
| 64 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) | 64 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) |
| 65 : SystemTrayItem(system_tray), tray_view_(nullptr) {} | 65 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA), |
| 66 tray_view_(nullptr) {} |
| 66 | 67 |
| 67 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} | 68 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} |
| 68 | 69 |
| 69 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { | 70 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { |
| 70 tray_view_ = new tray::MultiProfileMediaTrayView(this); | 71 tray_view_ = new tray::MultiProfileMediaTrayView(this); |
| 71 return tray_view_; | 72 return tray_view_; |
| 72 } | 73 } |
| 73 | 74 |
| 74 void MultiProfileMediaTrayItem::DestroyTrayView() { | 75 void MultiProfileMediaTrayItem::DestroyTrayView() { |
| 75 tray_view_ = nullptr; | 76 tray_view_ = nullptr; |
| 76 } | 77 } |
| 77 | 78 |
| 78 } // namespace ash | 79 } // namespace ash |
| OLD | NEW |