Use mojo Shelf interfaces for both mash and classic ash.

ash/common/wm/panels/panel_layout_manager.cc

 // Copyright (c) 2012 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/common/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 421 matching lines @@
     const gfx::Size min_size = child->GetMinimumSize();
     bounds.set_width(std::max(min_size.width(), bounds.width()));
     bounds.set_height(std::max(min_size.height(), bounds.height()));
   }
 
   child->SetBoundsDirect(bounds);
   Relayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, WmShellObserver implementation:
+// PanelLayoutManager, ShellObserver implementation:
 
 void PanelLayoutManager::OnOverviewModeEnded() {
   Relayout();
 }
 
 void PanelLayoutManager::OnShelfAlignmentChanged(WmWindow* root_window) {
   if (root_window_controller_->GetWindow() == root_window)
     Relayout();
 }
 
@@ skipping 449 matching lines @@
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {}
 
 }  // namespace ash