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

Side by Side Diff: ash/system/media_security/multi_profile_media_tray_item.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
OLDNEW
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/common/ash_view_ids.h"
8 #include "ash/media_controller.h" 8 #include "ash/common/media_controller.h"
9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/wm_shell.h"
9 #include "ash/resources/grit/ash_resources.h" 11 #include "ash/resources/grit/ash_resources.h"
10 #include "ash/resources/vector_icons/vector_icons.h" 12 #include "ash/resources/vector_icons/vector_icons.h"
11 #include "ash/session/session_state_delegate.h"
12 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
13 #include "ash/system/tray/tray_constants.h" 14 #include "ash/system/tray/tray_constants.h"
14 #include "ash/system/tray/tray_item_view.h" 15 #include "ash/system/tray/tray_item_view.h"
15 #include "ash/wm_shell.h"
16 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
17 #include "ui/gfx/paint_vector_icon.h" 17 #include "ui/gfx/paint_vector_icon.h"
18 #include "ui/views/controls/image_view.h" 18 #include "ui/views/controls/image_view.h"
19 19
20 namespace ash { 20 namespace ash {
21 namespace tray { 21 namespace tray {
22 22
23 class MultiProfileMediaTrayView : public TrayItemView, 23 class MultiProfileMediaTrayView : public TrayItemView,
24 public MediaCaptureObserver { 24 public MediaCaptureObserver {
25 public: 25 public:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray) 66 MultiProfileMediaTrayItem::MultiProfileMediaTrayItem(SystemTray* system_tray)
67 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA) {} 67 : SystemTrayItem(system_tray, UMA_MULTI_PROFILE_MEDIA) {}
68 68
69 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {} 69 MultiProfileMediaTrayItem::~MultiProfileMediaTrayItem() {}
70 70
71 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) { 71 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) {
72 return new tray::MultiProfileMediaTrayView(this); 72 return new tray::MultiProfileMediaTrayView(this);
73 } 73 }
74 74
75 } // namespace ash 75 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698