Move the concept of Activation to the Shell.

ui/aura/test/test_window_delegate.h

 // Copyright (c) 2011 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 UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
 #define UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 13 matching lines @@
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual bool OnKeyEvent(KeyEvent* event) OVERRIDE;
   virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
   virtual bool OnMouseEvent(MouseEvent* event) OVERRIDE;
   virtual ui::TouchStatus OnTouchEvent(TouchEvent* event) OVERRIDE;
   virtual bool CanFocus() OVERRIDE;
-  virtual bool ShouldActivate(Event* event) OVERRIDE;
-  virtual void OnActivated() OVERRIDE;
-  virtual void OnLostActive() OVERRIDE;
   virtual void OnCaptureLost() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
 };
 
@@ skipping 11 matching lines @@
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   SkColor color_;
   ui::KeyboardCode last_key_code_;
 
   DISALLOW_COPY_AND_ASSIGN(ColorTestWindowDelegate);
 };
 
-class ActivateWindowDelegate : public TestWindowDelegate {
- public:
-  ActivateWindowDelegate();
-  explicit ActivateWindowDelegate(bool activate);
-
-  void set_activate(bool v) { activate_ = v; }
-  int activated_count() const { return activated_count_; }
-  int lost_active_count() const { return lost_active_count_; }
-  int should_activate_count() const { return should_activate_count_; }
-  void Clear() {
-    activated_count_ = lost_active_count_ = should_activate_count_ = 0;
-  }
-
-  // Overridden from TestWindowDelegate:
-  virtual bool ShouldActivate(Event* event) OVERRIDE;
-  virtual void OnActivated() OVERRIDE;
-  virtual void OnLostActive() OVERRIDE;
-
- private:
-  bool activate_;
-  int activated_count_;
-  int lost_active_count_;
-  int should_activate_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(ActivateWindowDelegate);
-};
-
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_