Reland of Improves focus/activation for aura-mus and DesktopNativeWidgetAura

ui/aura/client/focus_client.cc

Index: ui/aura/client/focus_client.cc
diff --git a/ui/aura/client/focus_client.cc b/ui/aura/client/focus_client.cc
index 0f69c5e496721b94fc3737aa1c0b75c125cf19f2..a5f179df589ac441a52da6208de0364f36aa1081 100644
--- a/ui/aura/client/focus_client.cc
+++ b/ui/aura/client/focus_client.cc
@@ -7,16 +7,16 @@
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::FocusClient*)
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::client::FocusClient*)
 
 namespace aura {
 namespace client {
 
-DEFINE_WINDOW_PROPERTY_KEY(FocusClient*, kRootWindowFocusClientKey, NULL);
+DEFINE_WINDOW_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr);
 
 void SetFocusClient(Window* root_window, FocusClient* client) {
   DCHECK_EQ(root_window->GetRootWindow(), root_window);
-  root_window->SetProperty(kRootWindowFocusClientKey, client);
+  root_window->SetProperty(kFocusClientKey, client);
 }
 
 FocusClient* GetFocusClient(Window* window) {
@@ -25,8 +25,7 @@
 
 FocusClient* GetFocusClient(const Window* window) {
   const Window* root_window = window->GetRootWindow();
-  return root_window ?
-      root_window->GetProperty(kRootWindowFocusClientKey) : NULL;
+  return root_window ? root_window->GetProperty(kFocusClientKey) : nullptr;
 }
 
 }  // namespace client