Move more from WmShell to Shell

ash/common/system/tray/system_tray_bubble.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/system/tray/system_tray_bubble.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 108 matching lines @@
         shadow->SetOpacity(0.15f);
       }
     }
   }
 
   DestroyItemViews();
   bubble_view_->RemoveAllChildViews(true);
 
   items_ = items;
   bubble_type_ = bubble_type;
-  CreateItemViews(WmShell::Get()->system_tray_delegate()->GetUserLoginStatus());
+  CreateItemViews(Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
 
   // Close bubble view if we failed to create the item view.
   if (!bubble_view_->has_children()) {
     Close();
     return;
   }
 
   UpdateBottomPadding();
   bubble_view_->GetWidget()->GetContentsView()->Layout();
   // Make sure that the bubble is large enough for the default view.
@@ skipping 173 matching lines @@
     }
   }
 
   if (focus_view) {
     tray_->ActivateBubble();
     focus_view->RequestFocus();
   }
 }
 
 }  // namespace ash