Move ActivationClient/Delegate to client namespace.

ui/aura_shell/test/test_activation_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_SHELL_TEST_TEST_ACTIVATION_DELEGATE_H_
 #define UI_AURA_SHELL_TEST_TEST_ACTIVATION_DELEGATE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "ui/aura/client/activation_delegate.h"
 
 namespace aura {
 class Window;
 }
 
 namespace aura_shell {
 namespace test {
 
 // A test ActivationDelegate that can be used to track activation changes for
 // an aura::Window.
-class TestActivationDelegate : public aura::ActivationDelegate {
+class TestActivationDelegate : public aura::client::ActivationDelegate {
  public:
   TestActivationDelegate();
   explicit TestActivationDelegate(bool activate);
 
   // Associates this delegate with a Window.
   void SetWindow(aura::Window* window);
 
   bool window_was_active() const { return window_was_active_; }
   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;
     window_was_active_ = false;
   }
 
-  // Overridden from ActivationDelegate:
+  // Overridden from client::ActivationDelegate:
   virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
   virtual void OnActivated() OVERRIDE;
   virtual void OnLostActive() OVERRIDE;
 
  private:
   aura::Window* window_;
   bool window_was_active_;
   bool activate_;
   int activated_count_;
   int lost_active_count_;
   int should_activate_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
 };
 
 }  // namespace test
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_TEST_TEST_ACTIVATION_DELEGATE_H_