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

Unified Diff: mash/wm/property_util.cc

Issue 2024313002: Moves mash/wm/public -> ash/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 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 | « mash/wm/property_util.h ('k') | mash/wm/public/interfaces/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/property_util.cc
diff --git a/mash/wm/property_util.cc b/mash/wm/property_util.cc
index 922c6e6710a7c13013df250484e46eaa0fd9abd6..0efdb7645d5c71f1612cd14484a5f1290cc2b331 100644
--- a/mash/wm/property_util.cc
+++ b/mash/wm/property_util.cc
@@ -70,12 +70,13 @@ 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));
+ash::mojom::Container GetRequestedContainer(const mus::Window* window) {
+ if (window->HasSharedProperty(ash::mojom::kWindowContainer_Property)) {
+ return static_cast<ash::mojom::Container>(
+ window->GetSharedProperty<int32_t>(
+ ash::mojom::kWindowContainer_Property));
}
- return mojom::Container::USER_PRIVATE_WINDOWS;
+ return ash::mojom::Container::USER_PRIVATE_WINDOWS;
}
int32_t GetResizeBehavior(const mus::Window* window) {
@@ -157,12 +158,12 @@ ui::wm::WindowType GetWmWindowType(const mus::Window* window) {
return ui::wm::WINDOW_TYPE_UNKNOWN;
}
-mojom::AshWindowType GetAshWindowType(const mus::Window* window) {
- if (!window->HasSharedProperty(mojom::kAshWindowType_Property))
- return mojom::AshWindowType::COUNT;
+ash::mojom::AshWindowType GetAshWindowType(const mus::Window* window) {
+ if (!window->HasSharedProperty(ash::mojom::kAshWindowType_Property))
+ return ash::mojom::AshWindowType::COUNT;
- return static_cast<mojom::AshWindowType>(
- window->GetSharedProperty<int32_t>(mojom::kAshWindowType_Property));
+ return static_cast<ash::mojom::AshWindowType>(
+ window->GetSharedProperty<int32_t>(ash::mojom::kAshWindowType_Property));
}
base::string16 GetWindowTitle(const mus::Window* window) {
« no previous file with comments | « mash/wm/property_util.h ('k') | mash/wm/public/interfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698