mash: Initialize ash::MaterialDesignController on startup

ash/mus/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_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #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/material_design/material_design_controller.h"
 #include "ash/mus/app_list_presenter_mus.h"
 #include "ash/mus/keyboard_ui_mus.h"
 #include "ash/mus/shelf_delegate_mus.h"
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/stub_context_factory.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
@@ skipping 166 matching lines @@
   }
 
   ~AshInit() { worker_pool_->Shutdown(); }
 
   aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
 
   void Initialize(::shell::Connector* connector,
                   const ::shell::Identity& identity) {
     InitializeResourceBundle(connector);
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+    ash::MaterialDesignController::Initialize();

[msw, 2016/05/16 21:29:43]

nit: perhaps also call ui::MaterialDesignController::Initialize()?

[James Cook, 2016/05/16 21:32:18]

ui::MaterialDesignController::Initialize() is done as part of views::AuraInit
construction on the line above. It needs to be done down in //ui for tests, but
the ash init has to happen at a higher level, like Chrome browser main (where it
is done for Chrome) or here.

[msw, 2016/05/16 21:34:57]

Acknowledged.

     views::WindowManagerConnection::Create(connector, identity);
 
     display::Screen* screen = display::Screen::GetScreen();
     DCHECK(screen);
     gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
 
     // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
     // installs and uses the ScreenAsh. This can be removed once ash learns to
     // talk to mus for managing displays.
     // TODO(mfomitchev): We need to fix this. http://crbug.com/607300
@@ skipping 113 matching lines @@
 void SysUIApplication::Create(
     ::shell::Connection* connection,
     mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash