Move ActivationClient/Delegate to client namespace.

ui/views/widget/native_widget_aura.cc

 // 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.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 75 matching lines @@
     aura::RootWindow::GetInstance()->RemoveObserver(this);
   }
 
   // Overridden from aura::WindowObserver:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const char* key,
                                        void* old) OVERRIDE {
     if (key != aura::kRootWindowActiveWindow)
       return;
     aura::Window* active =
-        aura::ActivationClient::GetActivationClient()->GetActiveWindow();
+        aura::client::GetActivationClient()->GetActiveWindow();
     if (!active || (active != host_->window_ &&
                     active->transient_parent() != host_->window_)) {
       host_->delegate_->EnableInactiveRendering();
     }
   }
 
  private:
   NativeWidgetAura* host_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveWindowObserver);
@@ skipping 73 matching lines @@
   if (params.type != Widget::InitParams::TYPE_TOOLTIP) {
     tooltip_manager_.reset(new views::TooltipManagerAura(this));
   }
 
   drop_helper_.reset(new DropHelper(GetWidget()->GetRootView()));
   if (params.type != Widget::InitParams::TYPE_TOOLTIP &&
       params.type != Widget::InitParams::TYPE_POPUP) {
     aura::client::SetDragDropDelegate(window_, this);
   }
 
-  aura::ActivationDelegate::SetActivationDelegate(window_, this);
+  aura::client::SetActivationDelegate(window_, this);
 
   if (window_type == Widget::InitParams::TYPE_MENU ||
       window_type == Widget::InitParams::TYPE_TOOLTIP)
     window_->SetIntProperty(aura::kShadowTypeKey,
                             aura::SHADOW_TYPE_RECTANGULAR);
 }
 
 NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() {
   return NULL;
 }
@@ skipping 234 matching lines @@
                         !GetWidget()->SetInitialFocus())) {
     Activate();
   }
 }
 
 bool NativeWidgetAura::IsVisible() const {
   return window_->IsVisible();
 }
 
 void NativeWidgetAura::Activate() {
-  aura::ActivationClient::GetActivationClient()->ActivateWindow(window_);
+  aura::client::GetActivationClient()->ActivateWindow(window_);
 }
 
 void NativeWidgetAura::Deactivate() {
-  aura::ActivationClient::GetActivationClient()->DeactivateWindow(window_);
+  aura::client::GetActivationClient()->DeactivateWindow(window_);
 }
 
 bool NativeWidgetAura::IsActive() const {
-  return aura::ActivationClient::GetActivationClient()->GetActiveWindow() ==
-      window_;
+  return aura::client::GetActivationClient()->GetActiveWindow() == window_;
 }
 
 void NativeWidgetAura::SetAlwaysOnTop(bool on_top) {
   window_->SetIntProperty(aura::kAlwaysOnTopKey, on_top);
 }
 
 void NativeWidgetAura::Maximize() {
   window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
@@ skipping 383 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::RootWindow::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views