| 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_controller.h" | 8 #include "ash/common/media_controller.h" |
| 9 #include "ash/common/session/session_controller.h" | 9 #include "ash/common/session/session_controller.h" |
| 10 #include "ash/common/system/tray/system_tray_notifier.h" | 10 #include "ash/common/system/tray/system_tray_notifier.h" |
| 11 #include "ash/common/system/tray/tray_constants.h" | 11 #include "ash/common/system/tray/tray_constants.h" |
| 12 #include "ash/common/system/tray/tray_item_view.h" | 12 #include "ash/common/system/tray/tray_item_view.h" |
| 13 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
| 14 #include "ash/resources/vector_icons/vector_icons.h" | 14 #include "ash/resources/vector_icons/vector_icons.h" |
| 15 #include "ash/shell.h" |
| 15 #include "ui/gfx/paint_vector_icon.h" | 16 #include "ui/gfx/paint_vector_icon.h" |
| 16 #include "ui/views/controls/image_view.h" | 17 #include "ui/views/controls/image_view.h" |
| 17 | 18 |
| 18 namespace ash { | 19 namespace ash { |
| 19 namespace tray { | 20 namespace tray { |
| 20 | 21 |
| 21 class MultiProfileMediaTrayView : public TrayItemView, | 22 class MultiProfileMediaTrayView : public TrayItemView, |
| 22 public MediaCaptureObserver { | 23 public MediaCaptureObserver { |
| 23 public: | 24 public: |
| 24 explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item) | 25 explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item) |
| 25 : TrayItemView(system_tray_item) { | 26 : TrayItemView(system_tray_item) { |
| 26 CreateImageView(); | 27 CreateImageView(); |
| 27 image_view()->SetImage( | 28 image_view()->SetImage( |
| 28 gfx::CreateVectorIcon(kSystemTrayRecordingIcon, kTrayIconColor)); | 29 gfx::CreateVectorIcon(kSystemTrayRecordingIcon, kTrayIconColor)); |
| 29 WmShell::Get()->media_controller()->AddObserver(this); | 30 Shell::Get()->media_controller()->AddObserver(this); |
| 30 SetVisible(false); | 31 SetVisible(false); |
| 31 WmShell::Get()->media_controller()->RequestCaptureState(); | 32 Shell::Get()->media_controller()->RequestCaptureState(); |
| 32 set_id(VIEW_ID_MEDIA_TRAY_VIEW); | 33 set_id(VIEW_ID_MEDIA_TRAY_VIEW); |
| 33 } | 34 } |
| 34 | 35 |
| 35 ~MultiProfileMediaTrayView() override { | 36 ~MultiProfileMediaTrayView() override { |
| 36 WmShell::Get()->media_controller()->RemoveObserver(this); | 37 Shell::Get()->media_controller()->RemoveObserver(this); |
| 37 } | 38 } |
| 38 | 39 |
| 39 // MediaCaptureObserver: | 40 // MediaCaptureObserver: |
| 40 void OnMediaCaptureChanged( | 41 void OnMediaCaptureChanged( |
| 41 const std::vector<mojom::MediaCaptureState>& capture_states) override { | 42 const std::vector<mojom::MediaCaptureState>& capture_states) override { |
| 42 SessionController* controller = WmShell::Get()->session_controller(); | 43 SessionController* controller = WmShell::Get()->session_controller(); |
| 43 // The user at 0 is the current desktop user. | 44 // The user at 0 is the current desktop user. |
| 44 for (UserIndex index = 1; index < controller->NumberOfLoggedInUsers(); | 45 for (UserIndex index = 1; index < controller->NumberOfLoggedInUsers(); |
| 45 ++index) { | 46 ++index) { |
| 46 if (capture_states[index] != mojom::MediaCaptureState::NONE) { | 47 if (capture_states[index] != mojom::MediaCaptureState::NONE) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 60 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) | 61 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) |
| 61 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA) {} | 62 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA) {} |
| 62 | 63 |
| 63 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} | 64 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} |
| 64 | 65 |
| 65 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { | 66 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { |
| 66 return new tray::MultiProfileMediaTrayView(this); | 67 return new tray::MultiProfileMediaTrayView(this); |
| 67 } | 68 } |
| 68 | 69 |
| 69 } // namespace ash | 70 } // namespace ash |
| OLD | NEW |