Refactor: Shelf Widget

ash/wm/ash_activation_controller_unittest.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/wm/ash_activation_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/views/corewm/corewm_switches.h"
 
 namespace ash {
 
 namespace wm {
 
 namespace {
 
 class AshActivationControllerTest : public test::AshTestBase {
  public:
   AshActivationControllerTest()
       : launcher_(NULL), launcher_widget_(NULL), launcher_window_(NULL) {}
   virtual ~AshActivationControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     ash_activation_controller_.reset(new internal::AshActivationController());
     launcher_ = Launcher::ForPrimaryDisplay();
     ASSERT_TRUE(launcher_);
-    launcher_widget_ = launcher_->widget();
+    launcher_widget_ = launcher_->shelf_widget();
     ASSERT_TRUE(launcher_widget_);
     launcher_window_ = launcher_widget_->GetNativeWindow();
     ASSERT_TRUE(launcher_window_);
   }
 
   void SetSpokenFeedbackState(bool enabled) {
     if (Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled() !=
         enabled) {
       Shell::GetInstance()->delegate()->ToggleSpokenFeedback(
           A11Y_NOTIFICATION_NONE);
@@ skipping 114 matching lines @@
 
   // Verify if the launcher didn't get activated as fallback.
   ASSERT_NE(launcher_window_, GetActiveWindow());
 }
 
 }  // namespace
 
 }  // namespace wm
 
 }  // namespace ash