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

Unified Diff: ash/mus/property_util.cc

Issue 2033843003: Makes ash/mus use RootWindowControllerCommon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mash_wm
Patch Set: merge fail Created 4 years, 6 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/property_util.h ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/property_util.cc
diff --git a/ash/mus/property_util.cc b/ash/mus/property_util.cc
index 9d1922ea9a65b1d86192092ed192ab56a4518482..3daf0de42c5bea90ac2b409bcaf8f18e8c70ebcb 100644
--- a/ash/mus/property_util.cc
+++ b/ash/mus/property_util.cc
@@ -74,12 +74,14 @@ gfx::Size GetWindowPreferredSize(const ::mus::Window* window) {
return gfx::Size();
}
-mojom::Container GetRequestedContainer(const ::mus::Window* window) {
- if (window->HasSharedProperty(mojom::kWindowContainer_Property)) {
- return static_cast<mojom::Container>(
- window->GetSharedProperty<int32_t>(mojom::kWindowContainer_Property));
- }
- return mojom::Container::USER_PRIVATE_WINDOWS;
+bool GetRequestedContainer(const ::mus::Window* window,
+ mojom::Container* container) {
+ if (!window->HasSharedProperty(mojom::kWindowContainer_Property))
+ return false;
+
+ *container = static_cast<mojom::Container>(
+ window->GetSharedProperty<int32_t>(mojom::kWindowContainer_Property));
+ return true;
}
int32_t GetResizeBehavior(const ::mus::Window* window) {
« no previous file with comments | « ash/mus/property_util.h ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698