Revert 173417 - Broke on win_aura

ash/launcher/launcher.h

Index: ash/launcher/launcher.h
===================================================================
--- ash/launcher/launcher.h	(revision 173420)
+++ ash/launcher/launcher.h	(working copy)
@@ -12,7 +12,6 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/size.h"
-#include "ui/views/widget/widget_observer.h"
 
 namespace aura {
 class Window;
@@ -39,7 +38,7 @@
 class LauncherDelegate;
 class LauncherModel;
 
-class ASH_EXPORT Launcher: public views::WidgetObserver  {
+class ASH_EXPORT Launcher  {
  public:
   Launcher(LauncherModel* launcher_model,
            LauncherDelegate* launcher_delegate,
@@ -125,13 +124,6 @@
 
   aura::Window* window_container() { return window_container_; }
 
-  // Called by the activation delegate, before the launcher is activated
-  // when no other windows are visible.
-  void WillActivateAsFallback() { activating_as_fallback_ = true; }
-
-  // Overridden from views::WidgetObserver:
-  void OnWidgetActivationChanged(views::Widget* widget, bool active) OVERRIDE;
-
  private:
   class DelegateView;
 
@@ -157,9 +149,6 @@
   // Used to animate the background.
   internal::BackgroundAnimator background_animator_;
 
-  // Used then activation is forced from the activation delegate.
-  bool activating_as_fallback_;
-
   DISALLOW_COPY_AND_ASSIGN(Launcher);
 };