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

Unified Diff: ash/shell.h

Issue 1782793002: Ash: Implement Toasts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 74d0f125ee2250c829762f8ae26f5a41b4ec6317..413830a8303279553b835c1dfeee8687ad394df3 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -141,6 +141,7 @@ class SystemModalContainerEventFilter;
class SystemTray;
class SystemTrayDelegate;
class SystemTrayNotifier;
+class ToastManager;
class ToplevelWindowEventHandler;
class TouchTransformerController;
class TouchObserverHUD;
@@ -581,6 +582,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
StickyKeysController* sticky_keys_controller() {
return sticky_keys_controller_.get();
}
+
+ ToastManager* toast_manager() const { return toast_manager_.get(); }
oshima 2016/03/11 09:40:24 remove const (because it returns non const member)
yoshiki 2016/03/11 14:30:34 Done.
#endif // defined(OS_CHROMEOS)
GPUSupport* gpu_support() { return gpu_support_.get(); }
@@ -719,6 +722,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
scoped_ptr<StickyKeysController> sticky_keys_controller_;
+ scoped_ptr<ToastManager> toast_manager_;
scoped_ptr<ResolutionNotificationController>
resolution_notification_controller_;
scoped_ptr<BluetoothNotificationController>
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/shell.cc » ('j') | ash/system/toast/toast_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698