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

Side by Side Diff: content/browser/browser_main_loop.h

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 namespace net { 57 namespace net {
58 class NetworkChangeNotifier; 58 class NetworkChangeNotifier;
59 } // namespace net 59 } // namespace net
60 60
61 #if defined(USE_OZONE) 61 #if defined(USE_OZONE)
62 namespace ui { 62 namespace ui {
63 class ClientNativePixmapFactory; 63 class ClientNativePixmapFactory;
64 } // namespace ui 64 } // namespace ui
65 #endif 65 #endif
66 66
67 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
68 namespace views {
69 class WindowManagerConnection;
70 }
71 #endif
72
67 namespace content { 73 namespace content {
68 class BrowserMainParts; 74 class BrowserMainParts;
69 class BrowserOnlineStateObserver; 75 class BrowserOnlineStateObserver;
70 class BrowserThreadImpl; 76 class BrowserThreadImpl;
71 class MediaStreamManager; 77 class MediaStreamManager;
72 class MojoShellContext; 78 class MojoShellContext;
73 class ResourceDispatcherHostImpl; 79 class ResourceDispatcherHostImpl;
74 class SpeechRecognitionManagerImpl; 80 class SpeechRecognitionManagerImpl;
75 class StartupTaskRunner; 81 class StartupTaskRunner;
76 class TimeZoneMonitor; 82 class TimeZoneMonitor;
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_; 278 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
273 #elif defined(OS_LINUX) && defined(USE_UDEV) 279 #elif defined(OS_LINUX) && defined(USE_UDEV)
274 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_; 280 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
275 #elif defined(OS_MACOSX) && !defined(OS_IOS) 281 #elif defined(OS_MACOSX) && !defined(OS_IOS)
276 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; 282 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
277 #endif 283 #endif
278 #if defined(USE_OZONE) 284 #if defined(USE_OZONE)
279 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 285 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
280 #endif 286 #endif
281 287
288 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
289 std::unique_ptr<views::WindowManagerConnection> views_mus_;
sky 2016/05/31 18:57:24 window_manager_connection_
290 #endif
291
282 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 292 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
283 std::unique_ptr<MediaStreamManager> media_stream_manager_; 293 std::unique_ptr<MediaStreamManager> media_stream_manager_;
284 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; 294 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
285 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_; 295 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_;
286 296
287 // DO NOT add members here. Add them to the right categories above. 297 // DO NOT add members here. Add them to the right categories above.
288 298
289 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 299 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
290 }; 300 };
291 301
292 } // namespace content 302 } // namespace content
293 303
294 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 304 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698