Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1387)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 8894018: Move the concept of Activation to the Shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 114022)
+++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
@@ -100,6 +100,7 @@
skip_schedule_paint_(false) {
host_->SetView(this);
window_->SetProperty(aura::kTooltipTextKey, &tooltip_);
+ aura::ActivationDelegate::SetActivationDelegate(window_, this);
}
RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
@@ -542,16 +543,6 @@
return popup_type_ == WebKit::WebPopupTypeNone;
}
-bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) {
- return false;
-}
-
-void RenderWidgetHostViewAura::OnActivated() {
-}
-
-void RenderWidgetHostViewAura::OnLostActive() {
-}
-
void RenderWidgetHostViewAura::OnCaptureLost() {
host_->LostCapture();
}
@@ -582,6 +573,19 @@
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:
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698