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

Unified Diff: ui/wm/public/activation_client.cc

Issue 2821213002: chromeos: converts ash devtools to aura::Window (Closed)
Patch Set: fix cast Created 3 years, 8 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
« ui/wm/public/activation_client.h ('K') | « ui/wm/public/activation_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/public/activation_client.cc
diff --git a/ui/wm/public/activation_client.cc b/ui/wm/public/activation_client.cc
index 85636c0b13df2ffa701f8466f9ed5b36933f1b08..fcf0173201c4aaf8e77948178f4e7ea92ebc577b 100644
--- a/ui/wm/public/activation_client.cc
+++ b/ui/wm/public/activation_client.cc
@@ -21,9 +21,14 @@ void SetActivationClient(Window* root_window, ActivationClient* client) {
root_window->SetProperty(kRootWindowActivationClientKey, client);
}
+const ActivationClient* GetActivationClient(const Window* root_window) {
+ return root_window ? root_window->GetProperty(kRootWindowActivationClientKey)
+ : nullptr;
+}
+
ActivationClient* GetActivationClient(Window* root_window) {
- return root_window ?
- root_window->GetProperty(kRootWindowActivationClientKey) : NULL;
+ return root_window ? root_window->GetProperty(kRootWindowActivationClientKey)
+ : nullptr;
}
void SetHideOnDeactivate(Window* window, bool hide_on_deactivate) {
« ui/wm/public/activation_client.h ('K') | « ui/wm/public/activation_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698