mash: Fix ShelfItem mojo struct; add enums and traits.

chrome/browser/ui/views/task_manager_view.cc

 // Copyright 2015 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 "chrome/browser/ui/views/task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 18 matching lines @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(USE_ASH)
 // Note: gn check complains here, despite the correct conditional //ash dep.
-#include "ash/common/shelf/shelf_item_types.h"    // nogncheck
+#include "ash/public/cpp/shelf_item.h"            // nogncheck
 #include "ash/public/cpp/window_properties.h"     // nogncheck
 #include "ash/resources/grit/ash_resources.h"     // nogncheck
 #include "ash/wm/window_util.h"                   // nogncheck
 #include "chrome/browser/ui/ash/ash_util.h"       // nogncheck
 #include "ui/aura/client/aura_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #endif  // defined(USE_ASH)
 
 #if defined(OS_WIN)
@@ skipping 316 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
       g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_manager