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

content/browser/renderer_host/render_widget_host_view_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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
@@ skipping 82 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       is_fullscreen_(false),
       popup_parent_host_view_(NULL),
       is_loading_(false),
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
       current_surface_(gfx::kNullPluginWindow),
 #endif
       skip_schedule_paint_(false) {
   host_->SetView(this);
   window_->SetProperty(aura::kTooltipTextKey, &tooltip_);
-  aura::ActivationDelegate::SetActivationDelegate(window_, this);
 }
 
 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
 }
 
 void RenderWidgetHostViewAura::InitAsChild() {
   window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
   window_->SetName("RenderWidgetHostViewAura");
 }
 
@@ skipping 422 matching lines @@
     UpdateWebTouchEventAfterDispatch(&touch_event_, point);
   }
 
   return DecideTouchStatus(touch_event_, point);
 }
 
 bool RenderWidgetHostViewAura::CanFocus() {
   return popup_type_ == WebKit::WebPopupTypeNone;
 }
 
+bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) {
+  return false;
+}
+
+void RenderWidgetHostViewAura::OnActivated() {
+}
+
+void RenderWidgetHostViewAura::OnLostActive() {
+}
+
 void RenderWidgetHostViewAura::OnCaptureLost() {
   host_->LostCapture();
 }
 
 void RenderWidgetHostViewAura::OnPaint(gfx::Canvas* canvas) {
   if (!window_->IsVisible())
     return;
   skip_schedule_paint_ = true;
   BackingStore* backing_store = host_->GetBackingStore(true);
   skip_schedule_paint_ = false;
@@ skipping 10 matching lines @@
 }
 
 void RenderWidgetHostViewAura::OnWindowDestroyed() {
   host_->ViewDestroyed();
   delete this;
 }
 
 void RenderWidgetHostViewAura::OnWindowVisibilityChanged(bool visible) {
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// RenderWidgetHostViewAura, aura::ActivationDelegate implementation:
-
-bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) {
-  return false;
-}
-
-void RenderWidgetHostViewAura::OnActivated() {
-}
-
-void RenderWidgetHostViewAura::OnLostActive() {
-}
-
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, ui::CompositorDelegate implementation:
 
 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) {
   for (std::vector< base::Callback<void(void)> >::const_iterator
       it = on_compositing_ended_callbacks_.begin();
       it != on_compositing_ended_callbacks_.end(); ++it) {
     it->Run();
   }
@@ skipping 24 matching lines @@
 // static
 void RenderWidgetHostView::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
 }