Reland 179231

ash/launcher/launcher.cc

Index: ash/launcher/launcher.cc
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index f07f8fd47a85caa46cf643669915305f62a19c51..09af40c120a680d59919a1367617e9fa7430459d 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -96,8 +96,8 @@ class Launcher::DelegateView : public views::WidgetDelegate,
 // 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,

[xiyuan, 2013/01/23 23:46:28]

DimmerView is passed as a delegate when creating its widget. So it does not need
to be a WidgetDelegateView.

+                             public aura::WindowObserver {
  public:
   explicit DimmerView(Launcher* launcher)
       : launcher_(launcher) {