Move ActivationClient/Delegate to client namespace.

BUG=none
TEST=existing automation
TBR=sky
Review URL: http://codereview.chromium.org/8956004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114657 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 4 deletions

diff --git a/ui/aura/test/test_activation_client.cc b/ui/aura/test/test_activation_client.cc
index 6f32ea7..a6aef6a 100644
--- a/ui/aura/test/test_activation_client.cc
+++ b/ui/aura/test/test_activation_client.cc
@@ -13,14 +13,14 @@ namespace test {
 // TestActivationClient, public:
 
 TestActivationClient::TestActivationClient() : active_window_(NULL) {
-  ActivationClient::SetActivationClient(this);
+  client::SetActivationClient(this);
 }
 
 TestActivationClient::~TestActivationClient() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, ActivationClient implementation:
+// TestActivationClient, client::ActivationClient implementation:
 
 void TestActivationClient::ActivateWindow(Window* window) {
   if (active_window_)
diff --git a/ui/aura/test/test_activation_client.h b/ui/aura/test/test_activation_client.h
index 22d56e5..a0454ca 100644
--- a/ui/aura/test/test_activation_client.h
+++ b/ui/aura/test/test_activation_client.h
@@ -14,12 +14,13 @@
 namespace aura {
 namespace test {
 
-class TestActivationClient : public ActivationClient, public WindowObserver {
+class TestActivationClient : public client::ActivationClient,
+                             public WindowObserver {
  public:
   TestActivationClient();
   virtual ~TestActivationClient();
 
-  // Overridden from ActivationClient:
+  // Overridden from client::ActivationClient:
   virtual void ActivateWindow(Window* window) OVERRIDE;
   virtual void DeactivateWindow(Window* window) OVERRIDE;
   virtual Window* GetActiveWindow() OVERRIDE;