Bug fix: Show mouse cursor during full screen share on ChromeOS.

content/browser/media/capture/cursor_renderer_aura.cc

 // Copyright (c) 2015 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/media/capture/cursor_renderer_aura.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 58 matching lines @@
   }
   const gfx::Rect window_bounds = window_->GetBoundsInScreen();
   gfx::Point cursor_position = aura::Env::GetInstance()->last_mouse_location();
   if (!window_bounds.Contains(cursor_position)) {
     // Return early if there is no need to draw the cursor.
     DVLOG(2) << "Skipping update with cursor outside the window";
     Clear();
     return false;
   }
 
-  aura::client::ActivationClient* activation_client =
-      aura::client::GetActivationClient(window_->GetRootWindow());
-  DCHECK(activation_client);
-  aura::Window* active_window = activation_client->GetActiveWindow();
-  if (!active_window->Contains(window_)) {
-    // Return early if the target window is not active.
-    DVLOG(2) << "Skipping update on an inactive window";
-    Clear();
-    return false;
+  // No need to check whether the root window, namely the screen is active or
+  // not.

[Sergey Ulanov, 2015/12/16 01:43:36]

Please reword this to make it clear what's going on here. E.g.:
  // If this is not a root window then the cursor should be rendered
  // only when the window is active.

[qiangchen, 2015/12/16 17:30:05]

Done.

+  if (!window_->IsRootWindow()){

[Sergey Ulanov, 2015/12/16 01:43:36]

formatting: need a space before {

[qiangchen, 2015/12/16 17:30:05]

Done.

+    aura::client::ActivationClient* activation_client =
+        aura::client::GetActivationClient(window_->GetRootWindow());
+    DCHECK(activation_client);
+    aura::Window* active_window = activation_client->GetActiveWindow();
+    if (!active_window->Contains(window_)) {
+      // Return early if the target window is not active.
+      DVLOG(2) << "Skipping update on an inactive window";
+      Clear();
+      return false;
+    }
   }
 
   gfx::NativeCursor cursor = window_->GetHost()->last_cursor();
   gfx::Point cursor_hot_point;
   if (last_cursor_ != cursor ||
       window_size_when_cursor_last_updated_ != window_bounds.size()) {
     SkBitmap cursor_bitmap;
     if (ui::GetCursorBitmap(cursor, &cursor_bitmap, &cursor_hot_point)) {
       const int scaled_width = cursor_bitmap.width() * region_in_frame.width() /
                                window_bounds.width();
@@ skipping 112 matching lines @@
 }
 
 void CursorRendererAura::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window_, window);
   window_->RemovePreTargetHandler(this);
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace content