ash: Move ShelfWidget ownership to WmShelf and refactor access to it

ash/mus/bridge/wm_shelf_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_shelf_mus.h"
 
 #include "ash/common/shelf/shelf_widget.h"
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 
 namespace ash {
 namespace mus {
 
 WmShelfMus::WmShelfMus(WmRootWindowController* root_window_controller) {

[msw, 2016/08/31 23:01:39]

optional nit: pass in WmWindow* root_window

[James Cook, 2016/08/31 23:33:45]

Done.

   DCHECK(root_window_controller);
   WmShell::Get()->CreateShelfDelegate();
   WmWindow* root = root_window_controller->GetWindow();
-  shelf_widget_.reset(new ShelfWidget(
-      root->GetChildByShellWindowId(kShellWindowId_ShelfContainer),
-      root->GetChildByShellWindowId(kShellWindowId_StatusContainer), this));
+  CreateShelfWidget(root);
   InitializeShelf();
   WmShell::Get()->NotifyShelfCreatedForRootWindow(root);
-  shelf_widget_->PostCreateShelf();
+  shelf_widget()->PostCreateShelf();
 }
 
 WmShelfMus::~WmShelfMus() {
-  shelf_widget_.reset();
+  DestroyShelfWidget();
   ShutdownShelf();
 }
 
 void WmShelfMus::WillDeleteShelfLayoutManager() {
-  shelf_widget_->Shutdown();
+  ShutdownShelfWidget();
   WmShelf::WillDeleteShelfLayoutManager();
 }
 
 }  // namespace mus
 }  // namespace ash