ui/arc/notification/arc_notification_manager.cc - Issue 2139183003: mash: Migrate //ash/system/toast to WM common types

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: ui/arc/notification/arc_notification_manager.cc

Issue 2139183003: mash: Migrate //ash/system/toast to WM common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move test back 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

« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 "ui/arc/notification/arc_notification_manager.h"	5 #include "ui/arc/notification/arc_notification_manager.h"

6	6

	7 #include "ash/common/system/toast/toast_manager.h"

7 #include "ash/shell.h"	8 #include "ash/shell.h"

8 #include "ash/system/toast/toast_manager.h"

9 #include "base/memory/ptr_util.h"	9 #include "base/memory/ptr_util.h"

10 #include "base/stl_util.h"	10 #include "base/stl_util.h"

11 #include "ui/arc/notification/arc_custom_notification_item.h"	11 #include "ui/arc/notification/arc_custom_notification_item.h"

12 #include "ui/arc/notification/arc_notification_item.h"	12 #include "ui/arc/notification/arc_notification_item.h"

13	13

14 namespace arc {	14 namespace arc {

15	15

16 ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service,	16 ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service,

17 const AccountId& main_profile_id)	17 const AccountId& main_profile_id)

18 : ArcNotificationManager(bridge_service,	18 : ArcNotificationManager(bridge_service,

(...skipping 170 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {	189 void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {

190 ash::Shell::GetInstance()->toast_manager()->Show(	190 ash::Shell::GetInstance()->toast_manager()->Show(

191 ash::ToastData(data->id, data->text, data->duration, data->dismiss_text));	191 ash::ToastData(data->id, data->text, data->duration, data->dismiss_text));

192 }	192 }

193	193

194 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {	194 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {

195 ash::Shell::GetInstance()->toast_manager()->Cancel(data->id);	195 ash::Shell::GetInstance()->toast_manager()->Cancel(data->id);

196 }	196 }

197	197

198 } // namespace arc	198 } // namespace arc

OLD	NEW