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

Unified Diff: ui/arc/notification/arc_notification_manager.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/exo/wm_helper_ash.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/arc/notification/arc_notification_manager.cc
diff --git a/ui/arc/notification/arc_notification_manager.cc b/ui/arc/notification/arc_notification_manager.cc
index b4619203a7c13360a170dc3f7952d950bf5b83ef..556f18a3860d6483a8f989f663b0778c0d0cd42e 100644
--- a/ui/arc/notification/arc_notification_manager.cc
+++ b/ui/arc/notification/arc_notification_manager.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "ash/common/system/toast/toast_manager.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -245,12 +245,12 @@ void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {
base::UTF8ToUTF16(data->text.has_value() ? *data->text : std::string()));
const base::string16 dismiss_text16(base::UTF8ToUTF16(
data->dismiss_text.has_value() ? *data->dismiss_text : std::string()));
- ash::WmShell::Get()->toast_manager()->Show(
+ ash::Shell::GetInstance()->toast_manager()->Show(
ash::ToastData(data->id, text16, data->duration, dismiss_text16));
}
void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {
- ash::WmShell::Get()->toast_manager()->Cancel(data->id);
+ ash::Shell::GetInstance()->toast_manager()->Cancel(data->id);
}
} // namespace arc
« no previous file with comments | « components/exo/wm_helper_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698