| 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/media_security/multi_profile_media_tray_item.h" | 5 #include "ash/system/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_controller.h" | 8 #include "ash/media_controller.h" |
| 9 #include "ash/resources/vector_icons/vector_icons.h" | 9 #include "ash/resources/vector_icons/vector_icons.h" |
| 10 #include "ash/session/session_controller.h" | 10 #include "ash/session/session_controller.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/system/tray/system_tray_notifier.h" | 12 #include "ash/system/tray/system_tray_notifier.h" |
| 13 #include "ash/system/tray/tray_constants.h" | 13 #include "ash/system/tray/tray_constants.h" |
| 14 #include "ash/system/tray/tray_item_view.h" | 14 #include "ash/system/tray/tray_item_view.h" |
| 15 #include "ash/wm_shell.h" | |
| 16 #include "ui/gfx/paint_vector_icon.h" | 15 #include "ui/gfx/paint_vector_icon.h" |
| 17 #include "ui/views/controls/image_view.h" | 16 #include "ui/views/controls/image_view.h" |
| 18 | 17 |
| 19 namespace ash { | 18 namespace ash { |
| 20 namespace tray { | 19 namespace tray { |
| 21 | 20 |
| 22 class MultiProfileMediaTrayView : public TrayItemView, | 21 class MultiProfileMediaTrayView : public TrayItemView, |
| 23 public MediaCaptureObserver { | 22 public MediaCaptureObserver { |
| 24 public: | 23 public: |
| 25 explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item) | 24 explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item) |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) | 60 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) |
| 62 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA) {} | 61 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA) {} |
| 63 | 62 |
| 64 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} | 63 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} |
| 65 | 64 |
| 66 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { | 65 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { |
| 67 return new tray::MultiProfileMediaTrayView(this); | 66 return new tray::MultiProfileMediaTrayView(this); |
| 68 } | 67 } |
| 69 | 68 |
| 70 } // namespace ash | 69 } // namespace ash |
| OLD | NEW |