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

Unified 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, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 9bd8fa9ec633af854448295eb5613b792a776ee6..24105b65061aed3f21713256b83f73841b782039 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -64,6 +64,12 @@ class ClientNativePixmapFactory;
} // namespace ui
#endif
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+namespace views {
+class WindowManagerConnection;
+}
+#endif
+
namespace content {
class BrowserMainParts;
class BrowserOnlineStateObserver;
@@ -279,6 +285,10 @@ class CONTENT_EXPORT BrowserMainLoop {
std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
#endif
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+ std::unique_ptr<views::WindowManagerConnection> views_mus_;
sky 2016/05/31 18:57:24 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_;

Powered by Google App Engine
This is Rietveld 408576698