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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2518423003: Combine shelf platform and windowed app types. (Closed)
Patch Set: Fix kInvalidShelfID typo. Created 4 years, 1 month 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/common/test/test_shelf_delegate.cc ('k') | ash/shelf/shelf_unittest.cc » ('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 c0fb3b75a2ce673c9ada507f174c53c0ba327c09..b6cba40d070d83e9cea16b53d016f61c72423d29 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -440,8 +440,7 @@ int WmWindowMus::GetIntProperty(WmWindowProperty key) {
ui::mojom::WindowManager::kShelfItemType_Property);
}
// Mash provides a default shelf item type for non-ignored windows.
- return GetWindowIgnoredByShelf(window_) ? TYPE_UNDEFINED
- : TYPE_PLATFORM_APP;
+ return GetWindowIgnoredByShelf(window_) ? TYPE_UNDEFINED : TYPE_APP;
}
if (key == WmWindowProperty::TOP_VIEW_INSET) {
« no previous file with comments | « ash/common/test/test_shelf_delegate.cc ('k') | ash/shelf/shelf_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698