views/mus: Have explicit ownership of views::WindowManagerConnection.

content/browser/browser_main_loop.h

 // Copyright (c) 2012 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_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include <memory>
 
 #include "base/files/file_path.h"
@@ skipping 46 matching lines @@
 namespace net {
 class NetworkChangeNotifier;
 }  // namespace net
 
 #if defined(USE_OZONE)
 namespace ui {
 class ClientNativePixmapFactory;
 }  // namespace ui
 #endif
 
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)

[Ben Goodger (Google), 2016/05/31 23:23:39]

Are you sure MOJO_SHELL_CLIENT is defined in all the places that #include this
header?

[sadrul, 2016/05/31 23:43:51]

Oh, nice catch! I hadn't thought about that.

Looks like browser_main_loop.h is included from code only in //content/browser,
and one file outside of that: //content/public/browser/media_device_id.cc. For
code in //content/browser/, MOJO_SHELL_CLIENT is defined. But it wasn't defined
for media_device_id.cc. I have added that define (through gn config
//content/public/common:mojo_shell_client). That should take care of that. PTAL

+namespace views {
+class WindowManagerConnection;
+}
+#endif
+
 namespace content {
 class BrowserMainParts;
 class BrowserOnlineStateObserver;
 class BrowserThreadImpl;
 class MediaStreamManager;
 class MojoShellContext;
 class ResourceDispatcherHostImpl;
 class SpeechRecognitionManagerImpl;
 class StartupTaskRunner;
 class TimeZoneMonitor;
@@ skipping 195 matching lines @@
   std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
 #elif defined(OS_LINUX) && defined(USE_UDEV)
   std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
 #endif
 #if defined(USE_OZONE)
   std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #endif
 
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
+#endif
+
   std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
   std::unique_ptr<MediaStreamManager> media_stream_manager_;
   std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
   std::unique_ptr<TimeZoneMonitor> time_zone_monitor_;
 
   // DO NOT add members here. Add them to the right categories above.
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_