Revert 114095 - Move the concept of Activation to the Shell.

ui/aura/test/test_stacking_client.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_STACKING_CLIENT_H_
 #define UI_AURA_TEST_TEST_STACKING_CLIENT_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 11 matching lines @@
   // about it -- the c'tor passes ownership of the TestStackingClient to the
   // static Desktop object.
   TestStackingClient();
   virtual ~TestStackingClient();
 
   Window* default_container() { return default_container_.get(); }
 
  private:
   // Overridden from StackingClient:
   virtual void AddChildToDefaultParent(Window* window) OVERRIDE;
+  virtual bool CanActivateWindow(Window* window) const OVERRIDE;
+  virtual Window* GetTopmostWindowToActivate(Window* ignore) const OVERRIDE;
 
   scoped_ptr<Window> default_container_;
 
   DISALLOW_COPY_AND_ASSIGN(TestStackingClient);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_STACKING_CLIENT_H_