ash/mash: Introduce a ShelfDelegate implementation for mash.

ash/mus/sysui/sysui_application.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/sysui/sysui_application.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.h"
 #include "ash/mus/sysui/shell_delegate_mus.h"
@@ skipping 81 matching lines @@
       views::internal::NativeWidgetDelegate* delegate) {
     std::map<std::string, std::vector<uint8_t>> properties;
     if (params.parent) {
       mash::wm::mojom::Container container = GetContainerId(params.parent);
       if (container != mash::wm::mojom::Container::COUNT) {
         properties[mash::wm::mojom::kWindowContainer_Property] =
             mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
                 static_cast<int32_t>(container));
       }
     }
+
+    ui::ContextFactory* factory = aura::Env::GetInstance()->context_factory();

[msw, 2016/02/09 18:31:26]

This seems like a tangential workaround; care to add a comment?

[sadrul, 2016/02/10 08:04:41]

Split into a separate CL: https://codereview.chromium.org/1679023007

+    aura::Env::GetInstance()->set_context_factory(nullptr);
     views::NativeWidgetMus* native_widget =
         static_cast<views::NativeWidgetMus*>(
             views::WindowManagerConnection::Get()->CreateNativeWidgetMus(
                 properties, params, delegate));
+    aura::Env::GetInstance()->set_context_factory(factory);
+
     // TODO: Set the correct display id here.
     InitRootWindowSettings(native_widget->GetRootWindow())->display_id =
         Shell::GetInstance()
             ->display_manager()
             ->GetPrimaryDisplayCandidate()
             .id();
     return native_widget;
   }
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetFactory);
@@ skipping 83 matching lines @@
 
 void SysUIApplication::Initialize(mojo::Shell* shell,
                                   const std::string& url,
                                   uint32_t id) {
   ash_init_.reset(new AshInit());
   ash_init_->Initialize(shell);
 }
 
 }  // namespace sysui
 }  // namespace ash