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

Unified Diff: ash/mus/window_manager.cc

Issue 2694213003: mash: wires up shadows for mash (Closed)
Patch Set: defaults test Created 3 years, 10 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 | « no previous file | chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 03a99b4d11fad1a1e3b1432d03b0edd272141bf2..e9f5f9f6227899401df0f9e6490850b8fc828901 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,10 @@ 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;
+ if (property_converter_->IsTransportNameRegistered(name))
+ return true;
+ DVLOG(1) << "unknown property changed, ignoring " << name;
+ return false;
}
void WindowManager::OnWmSetCanFocus(aura::Window* window, bool can_focus) {
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698