Combine shelf platform and windowed app types.

ash/mus/bridge/wm_window_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/wm_window_mus.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 422 matching lines @@
     return kInvalidShelfID;
   }
 
   if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
     if (window_->HasSharedProperty(
             ui::mojom::WindowManager::kShelfItemType_Property)) {
       return window_->GetSharedProperty<int>(
           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) {
     // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
     NOTIMPLEMENTED();
     return 0;
   }
 
   NOTREACHED();
   return 0;
@@ skipping 588 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace mus
 }  // namespace ash