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

Unified Diff: ash/system/chromeos/media_security/multi_profile_media_tray_item.cc

Issue 2144783002: mash: Move MultiProfileMediaTrayItem to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 months 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
Index: ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc b/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
deleted file mode 100644
index 4164e8bf46188bb2d36c08b46eb3e68f0ae76d33..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
-
-#include "ash/common/ash_view_ids.h"
-#include "ash/common/media_delegate.h"
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/system/chromeos/media_security/media_capture_observer.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/system/tray/tray_item_view.h"
-#include "ash/common/wm_shell.h"
-#include "grit/ash_resources.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/layout/fill_layout.h"
-
-namespace ash {
-namespace tray {
-
-class MultiProfileMediaTrayView : public TrayItemView,
- public MediaCaptureObserver {
- public:
- explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item)
- : TrayItemView(system_tray_item) {
- SetLayoutManager(new views::FillLayout);
- views::ImageView* icon = new views::ImageView;
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- icon->SetImage(
- bundle.GetImageNamed(IDR_AURA_UBER_TRAY_RECORDING).ToImageSkia());
- AddChildView(icon);
- OnMediaCaptureChanged();
- WmShell::Get()->system_tray_notifier()->AddMediaCaptureObserver(this);
- set_id(VIEW_ID_MEDIA_TRAY_VIEW);
- }
-
- ~MultiProfileMediaTrayView() override {
- WmShell::Get()->system_tray_notifier()->RemoveMediaCaptureObserver(this);
- }
-
- // MediaCaptureObserver:
- void OnMediaCaptureChanged() override {
- MediaDelegate* media_delegate = WmShell::Get()->media_delegate();
- SessionStateDelegate* session_state_delegate =
- WmShell::Get()->GetSessionStateDelegate();
- // The user at 0 is the current desktop user.
- for (UserIndex index = 1;
- index < session_state_delegate->NumberOfLoggedInUsers(); ++index) {
- if (media_delegate->GetMediaCaptureState(index) != MEDIA_CAPTURE_NONE) {
- SetVisible(true);
- return;
- }
- }
- SetVisible(false);
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MultiProfileMediaTrayView);
-};
-
-} // namespace tray
-
-MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray)
- : SystemTrayItem(system_tray), tray_view_(NULL) {}
-
-MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {}
-
-views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) {
- tray_view_ = new tray::MultiProfileMediaTrayView(this);
- return tray_view_;
-}
-
-void MultiProfileMediaTrayItem::DestroyTrayView() {
- tray_view_ = NULL;
-}
-
-} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698