Move yet more from WmShell to Shell

ash/shell/app_list.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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/session/session_controller.h"
@@ skipping 94 matching lines @@
         ToplevelWindow::CreateParams params;
         params.can_resize = true;
         ToplevelWindow::CreateToplevelWindow(params);
         break;
       }
       case NON_RESIZABLE_WINDOW: {
         ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams());
         break;
       }
       case LOCK_SCREEN: {
-        WmShell::Get()->session_controller()->LockScreen();
+        Shell::Get()->session_controller()->LockScreen();
         break;
       }
       case WIDGETS_WINDOW: {
         CreateWidgetsWindow();
         break;
       }
       case EXAMPLES_WINDOW: {
         views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE);
         break;
       }
@@ skipping 202 matching lines @@
 };
 
 }  // namespace
 
 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
 }  // namespace shell
 }  // namespace ash