Revert 173417 - Broke on win_aura

ash/launcher/launcher.h

 // 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.
 
 #ifndef ASH_LAUNCHER_LAUNCHER_H_
 #define ASH_LAUNCHER_LAUNCHER_H_
 
 #include "ash/ash_export.h"
 #include "ash/launcher/background_animator.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shelf_types.h"
 #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;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class View;
 class Widget;
 }
 
 namespace ash {
 
 namespace internal {
 class FocusCycler;
 class LauncherView;
 class ShelfLayoutManager;
 }
 
 class LauncherIconObserver;
 class LauncherDelegate;
 class LauncherModel;
 
-class ASH_EXPORT Launcher: public views::WidgetObserver  {
+class ASH_EXPORT Launcher  {
  public:
   Launcher(LauncherModel* launcher_model,
            LauncherDelegate* launcher_delegate,
            aura::Window* window_container,
            internal::ShelfLayoutManager* shelf_layout_manager);
   virtual ~Launcher();
 
   // Return the launcher for the primary display. NULL if no user is
   // logged in yet.
   static Launcher* ForPrimaryDisplay();
@@ skipping 65 matching lines @@
   internal::LauncherView* GetLauncherViewForTest();
 
   LauncherDelegate* delegate() { return delegate_; }
 
   views::Widget* widget() { return widget_.get(); }
 
   views::Widget* GetDimmerWidgetForTest() { return dimmer_.get(); }
 
   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;
 
   // Widget hosting the view.
   scoped_ptr<views::Widget> widget_;
   scoped_ptr<views::Widget> dimmer_;
 
   aura::Window* window_container_;
 
   // Contents view of the widget. Houses the LauncherView.
   DelegateView* delegate_view_;
 
   // LauncherView used to display icons.
   internal::LauncherView* launcher_view_;
 
   ShelfAlignment alignment_;
 
   LauncherDelegate* delegate_;
 
   // Size reserved for the status area.
   gfx::Size status_size_;
 
   // 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);
 };
 
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_H_