Change ImmersiveContextMus to use DesktopCaptureClient.

ui/views/widget/desktop_aura/desktop_capture_client.cc

 // Copyright 2013 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/desktop_aura/desktop_capture_client.h"
 
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 
 namespace views {
 
 // static
 DesktopCaptureClient::CaptureClients*
 DesktopCaptureClient::capture_clients_ = NULL;
 
+// static
+aura::Window* DesktopCaptureClient::GetCaptureWindowGlobal() {
+  for (auto i = capture_clients_->begin(); i != capture_clients_->end(); ++i) {

[sadrul, 2017/01/25 16:40:22]

I was hoping something like this would work:

  for (auto* client : *capture_clients_) {
    if (client->capture_window_)
      return client->capture_window_;
  }

+    if ((*i)->capture_window_)
+      return (*i)->capture_window_;
+  }
+  return NULL;

[sadrul, 2017/01/25 16:40:22]

nullptr

+}
+
 DesktopCaptureClient::DesktopCaptureClient(aura::Window* root)
     : root_(root),
       capture_window_(NULL) {
   if (!capture_clients_)
     capture_clients_ = new CaptureClients;
   capture_clients_->insert(this);
   aura::client::SetCaptureClient(root, this);
 }
 
 DesktopCaptureClient::~DesktopCaptureClient() {
@@ skipping 55 matching lines @@
   if (capture_window_ != window)
     return;
   SetCapture(NULL);
 }
 
 aura::Window* DesktopCaptureClient::GetCaptureWindow() {
   return capture_window_;
 }
 
 aura::Window* DesktopCaptureClient::GetGlobalCaptureWindow() {
-  for (CaptureClients::iterator i = capture_clients_->begin();
-       i != capture_clients_->end(); ++i) {
-    if ((*i)->capture_window_)
-      return (*i)->capture_window_;
-  }
-  return NULL;
+  return GetCaptureWindowGlobal();
 }
 
 void DesktopCaptureClient::AddObserver(
     aura::client::CaptureClientObserver* observer) {
   NOTREACHED();
 }
 
 void DesktopCaptureClient::RemoveObserver(
     aura::client::CaptureClientObserver* observer) {
   NOTREACHED();
 }
 
 }  // namespace views