Chromium Code Reviews| Index: ash/mus/window_manager.cc |
| diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc |
| index 03a99b4d11fad1a1e3b1432d03b0edd272141bf2..99f66cba8e877159541c67e5ef393cc4dcd97cc1 100644 |
| --- a/ash/mus/window_manager.cc |
| +++ b/ash/mus/window_manager.cc |
| @@ -51,6 +51,7 @@ |
| #include "ui/views/mus/pointer_watcher_event_router.h" |
| #include "ui/views/mus/screen_mus.h" |
| #include "ui/wm/core/capture_controller.h" |
| +#include "ui/wm/core/shadow_types.h" |
| #include "ui/wm/core/wm_state.h" |
| #include "ui/wm/public/activation_client.h" |
| @@ -69,6 +70,9 @@ WindowManager::WindowManager(service_manager::Connector* connector) |
| ui::mojom::WindowManager::kRenderParentTitleArea_Property); |
| property_converter_->RegisterProperty( |
| kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property); |
| + property_converter_->RegisterProperty( |
| + ::wm::kShadowElevationKey, |
| + ui::mojom::WindowManager::kShadowElevation_Property); |
| } |
| WindowManager::~WindowManager() { |
| @@ -316,13 +320,7 @@ bool WindowManager::OnWmSetProperty( |
| new_data ? mojo::ConvertTo<bool>(**new_data) : false); |
| return false; // Won't attempt to map through property converter. |
| } |
| - return name == ui::mojom::WindowManager::kAppIcon_Property || |
| - name == ui::mojom::WindowManager::kShowState_Property || |
| - name == ui::mojom::WindowManager::kPreferredSize_Property || |
| - name == ui::mojom::WindowManager::kResizeBehavior_Property || |
| - name == ui::mojom::WindowManager::kShelfItemType_Property || |
| - name == ui::mojom::WindowManager::kWindowIcon_Property || |
| - name == ui::mojom::WindowManager::kWindowTitle_Property; |
| + return property_converter_->IsTransportNameRegistered(name); |
|
msw
2017/02/15 01:37:29
aside: I wonder if we should log when properties a
sky
2017/02/15 03:58:24
Good idea. Done.
|
| } |
| void WindowManager::OnWmSetCanFocus(aura::Window* window, bool can_focus) { |