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

Unified Diff: ash/shell.h

Issue 1949823002: WIP: Eliminate event.target() usage from TrayEventFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: container delegate Created 4 years, 7 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 | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 1db72a6247b226fc2b4461df72ad6654e6013023..4736282f09720cb63489f723d31de1d7e3de3c48 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -88,6 +88,7 @@ class AshNativeCursorManager;
class AutoclickController;
class BluetoothNotificationController;
class CaptureController;
+class ContainerDelegate;
class DesktopBackgroundController;
class DisplayChangeObserver;
class DisplayColorManager;
@@ -442,6 +443,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return media_delegate_.get();
}
+ ContainerDelegate* container_delegate() { return container_delegate_.get(); }
+
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
}
@@ -688,6 +691,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
std::unique_ptr<NewWindowDelegate> new_window_delegate_;
std::unique_ptr<MediaDelegate> media_delegate_;
+ std::unique_ptr<ContainerDelegate> container_delegate_;
std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
std::unique_ptr<ShelfDelegate> shelf_delegate_;
std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698