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

Unified Diff: ash/mus/bridge/wm_window_mus.cc

Issue 2411913003: Converts ash/wm/mru_window_tracker_unittest.cc to use AshTest (Closed)
Patch Set: comment Created 4 years, 2 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/bridge/wm_shell_mus.cc ('k') | ash/mus/property_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_window_mus.cc
diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
index dfd334918526d537e7b4b709a3d58834ebd60412..d567d30ee82eddd08bcb6620fa90951f1d4e48ad 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -104,6 +104,8 @@ ui::mojom::ShowState MojomWindowShowStateFromUI(ui::WindowShowState state) {
WmWindowProperty WmWindowPropertyFromUI(const std::string& ui_window_key) {
if (ui_window_key == ui::mojom::WindowManager::kAlwaysOnTop_Property)
return WmWindowProperty::ALWAYS_ON_TOP;
+ if (ui_window_key == ui::mojom::WindowManager::kExcludeFromMru_Property)
+ return WmWindowProperty::EXCLUDE_FROM_MRU;
if (ui_window_key == ui::mojom::WindowManager::kShelfIconResourceId_Property)
return WmWindowProperty::SHELF_ICON_RESOURCE_ID;
if (ui_window_key == ui::mojom::WindowManager::kShelfItemType_Property)
@@ -371,15 +373,14 @@ bool WmWindowMus::IsSystemModal() const {
bool WmWindowMus::GetBoolProperty(WmWindowProperty key) {
switch (key) {
- case WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY:
- return snap_children_to_pixel_boundary_;
-
case WmWindowProperty::ALWAYS_ON_TOP:
return IsAlwaysOnTop();
case WmWindowProperty::EXCLUDE_FROM_MRU:
- NOTIMPLEMENTED();
- return false;
+ return GetExcludeFromMru(window_);
+
+ case WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY:
+ return snap_children_to_pixel_boundary_;
default:
NOTREACHED();
@@ -836,7 +837,7 @@ void WmWindowMus::Unminimize() {
}
void WmWindowMus::SetExcludedFromMru(bool excluded_from_mru) {
- NOTIMPLEMENTED();
+ SetExcludeFromMru(window_, excluded_from_mru);
}
std::vector<WmWindow*> WmWindowMus::GetChildren() {
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/property_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698