ash/system/tray/media_security/multi_profile_media_tray_item.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

Patch Set: Created 4 years, 6 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

« ash/common/session/session_state_delegate.h ('K') | « ash/system/tray/default_system_tray_delegate.cc ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

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/tray/media_security/multi_profile_media_tray_item.h"	5 #include "ash/system/tray/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_delegate.h"	8 #include "ash/common/media_delegate.h"

9 #include "ash/session/session_state_delegate.h"	9 #include "ash/common/session/session_state_delegate.h"

10 #include "ash/shell.h"	10 #include "ash/shell.h"

11 #include "ash/system/tray/media_security/media_capture_observer.h"	11 #include "ash/system/tray/media_security/media_capture_observer.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_item_view.h"	13 #include "ash/system/tray/tray_item_view.h"

14 #include "grit/ash_resources.h"	14 #include "grit/ash_resources.h"

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/views/controls/image_view.h"	16 #include "ui/views/controls/image_view.h"

17 #include "ui/views/layout/fill_layout.h"	17 #include "ui/views/layout/fill_layout.h"

18	18

19 namespace ash {	19 namespace ash {

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 user::LoginStatus status) {	73 user::LoginStatus status) {

74 tray_view_ = new tray::MultiProfileMediaTrayView(this);	74 tray_view_ = new tray::MultiProfileMediaTrayView(this);

75 return tray_view_;	75 return tray_view_;

76 }	76 }

77	77

78 void MultiProfileMediaTrayItem::DestroyTrayView() {	78 void MultiProfileMediaTrayItem::DestroyTrayView() {

79 tray_view_ = NULL;	79 tray_view_ = NULL;

80 }	80 }

81	81

82 } // namespace ash	82 } // namespace ash

OLD	NEW