mash: Fix mash app shelf items; encapsulate ash property setup.

mash/example/views_examples/views_examples.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 <memory>
 #include <vector>
 
+#include "ash/public/cpp/shelf_types.h"
+#include "ash/public/cpp/window_properties.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_runner.h"
+#include "ui/aura/window.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/examples/examples_window.h"
 #include "ui/views/mus/aura_init.h"
+#include "ui/views/widget/widget.h"
 
 class ViewsExamples : public service_manager::Service,
                       public mash::mojom::Launchable {
  public:
   ViewsExamples() {
     registry_.AddInterface<mash::mojom::Launchable>(
         base::Bind(&ViewsExamples::Create, base::Unretained(this)));
   }
   ~ViewsExamples() override {}
 
  private:
   // service_manager::Service:
   void OnStart() override {
     aura_init_ = base::MakeUnique<views::AuraInit>(
         context()->connector(), context()->identity(),
         "views_mus_resources.pak", std::string(), nullptr,
         views::AuraInit::Mode::AURA_MUS);
+    ash::RegisterWindowPropertiesForTransportAndMirroring();
   }
   void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override {
     registry_.BindInterface(source_info, interface_name,
                             std::move(interface_pipe));
   }
 
   // mash::mojom::Launchable:
   void Launch(uint32_t what, mash::mojom::LaunchMode how) override {
-    views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE);
+    views::Widget* widget =
+        views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE);
+    aura::Window* window = widget->GetNativeWindow();
+    const ash::ShelfID shelf_id("org.chromium.mash.views_examples");
+    window->SetProperty(ash::kShelfIDKey,
+                        new std::string(shelf_id.Serialize()));
+    window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
   }
 
   void Create(const service_manager::BindSourceInfo& source_info,
               mash::mojom::LaunchableRequest request) {
     bindings_.AddBinding(this, std::move(request));
   }
 
   mojo::BindingSet<mash::mojom::Launchable> bindings_;
 
   service_manager::BinderRegistry registry_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsExamples);
 };
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   return service_manager::ServiceRunner(new ViewsExamples)
       .Run(service_request_handle);
 }