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

content/browser/renderer_host/render_widget_host_view_aura.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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 #pragma once
 
 #include <map>
 
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/content_export.h"
-#include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #endif
 
 namespace WebKit {
 class WebTouchEvent;
 }
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 class AcceleratedSurfaceContainerLinux;
 #endif
 
 class CONTENT_EXPORT RenderWidgetHostViewAura
     : NON_EXPORTED_BASE(public RenderWidgetHostView),
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
       public ui::CompositorObserver,
 #endif
-      public aura::WindowDelegate,
-      public aura::ActivationDelegate {
+      public aura::WindowDelegate {
  public:
   explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
   virtual ~RenderWidgetHostViewAura();
 
   // TODO(derat): Add an abstract RenderWidgetHostView::InitAsChild() method and
   // update callers: http://crbug.com/102450.
   void InitAsChild();
 
   // Overridden from RenderWidgetHostView:
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
@@ skipping 62 matching lines @@
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE;
   virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
   virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE;
   virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE;
   virtual bool CanFocus() OVERRIDE;
+  virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
+  virtual void OnActivated() OVERRIDE;
+  virtual void OnLostActive() OVERRIDE;
   virtual void OnCaptureLost() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
 
-  // Overridden from aura::ActivationDelegate:
-  virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
-  virtual void OnActivated() OVERRIDE;
-  virtual void OnLostActive() OVERRIDE;
-
  private:
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   // Overridden from ui::CompositorObserver:
   virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;
 #endif
 
   void UpdateCursorIfOverSelf();
   void UpdateExternalTexture();
 
   // The model object.
@@ skipping 29 matching lines @@
 
   gfx::PluginWindowHandle current_surface_;
 #endif
 
   bool skip_schedule_paint_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_