ash/system/chromeos/media_security/multi_profile_media_tray_item.cc - Issue 2125373002: mash: Migrate ash/system/user 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/chromeos/media_security/multi_profile_media_tray_item.cc

Issue 2125373002: mash: Migrate ash/system/user to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. 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 unified diff | Download patch

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

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

10 #include "ash/common/system/chromeos/media_security/media_capture_observer.h"	10 #include "ash/common/system/chromeos/media_security/media_capture_observer.h"

11 #include "ash/common/system/tray/system_tray_notifier.h"	11 #include "ash/common/system/tray/system_tray_notifier.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 "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"

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) {	69 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) {

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

71 return tray_view_;	71 return tray_view_;

72 }	72 }

73	73

74 void MultiProfileMediaTrayItem::DestroyTrayView() {	74 void MultiProfileMediaTrayItem::DestroyTrayView() {

75 tray_view_ = NULL;	75 tray_view_ = NULL;

76 }	76 }

77	77

78 } // namespace ash	78 } // namespace ash

OLD	NEW