Reland 179231

ash/launcher/launcher.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/launcher/launcher.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
@@ skipping 78 matching lines @@
   Launcher* launcher_;
   internal::FocusCycler* focus_cycler_;
   int alpha_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegateView);
 };
 
 // Class used to slightly dim shelf items when maximized and visible. It also
 // makes sure the widget changes size to always be of the same size as the
 // shelf.
-class Launcher::DimmerView : public views::WidgetDelegateView,
-                   public aura::WindowObserver {
+class Launcher::DimmerView : public views::View,
+                             public aura::WindowObserver {
  public:
   explicit DimmerView(Launcher* launcher)
       : launcher_(launcher) {
     launcher_->widget()->GetNativeWindow()->AddObserver(this);
   }
 
   ~DimmerView() {
     if (launcher_)
       launcher_->widget()->GetNativeWindow()->RemoveObserver(this);
   }
@@ skipping 329 matching lines @@
   } else {
     delegate_view_->GetFocusManager()->ClearFocus();
   }
 }
 
 internal::LauncherView* Launcher::GetLauncherViewForTest() {
   return launcher_view_;
 }
 
 }  // namespace ash