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

Unified Diff: ash/mus/bridge/wm_window_mus.cc

Issue 2176813002: mash: Migrate ShelfTooltipManager to wm common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comment. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/shelf/shelf_tooltip_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_window_mus.cc
diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
index c635a13f5de99d9f68ac77d30d80d67667cfde0f..3d86cd610d4c44bef2ad14d5660eddea07f68330 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -19,6 +19,7 @@
#include "services/ui/public/cpp/window_tree_client.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/aura/mus/mus_util.h"
+#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
#include "ui/display/display.h"
#include "ui/views/view.h"
@@ -739,6 +740,15 @@ bool WmWindowMus::HasObserver(const WmWindowObserver* observer) const {
return observers_.HasObserver(observer);
}
+void WmWindowMus::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
+ DCHECK(GetInternalWidget());
+ widget_->GetNativeWindow()->AddPreTargetHandler(handler);
+}
+
+void WmWindowMus::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
+ widget_->GetNativeWindow()->RemovePreTargetHandler(handler);
+}
+
void WmWindowMus::OnTreeChanging(const TreeChangeParams& params) {
WmWindowObserver::TreeChangeParams wm_params;
wm_params.target = Get(params.target);
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/shelf/shelf_tooltip_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698