content/browser/browser_main_loop.h - Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.h

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed nits Created 5 years, 5 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

« content/app/content_main_runner.cc ('K') | « content/app/content_main_runner.cc ('k') | content/browser/browser_main_loop.cc » ('j') | ui/ozone/common/stub_client_native_pixmap_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.h

diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h

index 14478ec5fbff89204eaa7d59427e5b49e8f3092c..2df27ab9d5b8441347c036c6693afb7a8f4255bd 100644

--- a/content/browser/browser_main_loop.h

+++ b/content/browser/browser_main_loop.h

@@ -39,6 +39,12 @@ namespace net {

class NetworkChangeNotifier;

} // namespace net

+#if defined(USE_OZONE)

+namespace ui {

+class ClientNativePixmapManager;

+} // namespace ui

+#endif

namespace content {

class BrowserMainParts;

class BrowserOnlineStateObserver;

@@ -245,6 +251,9 @@ class CONTENT_EXPORT BrowserMainLoop {

#elif defined(OS_MACOSX) && !defined(OS_IOS)

scoped_ptr<DeviceMonitorMac> device_monitor_mac_;

#endif

+#if defined(USE_OZONE)

+ scoped_ptr<ui::ClientNativePixmapManager> client_native_pixmap_manager_;

+#endif

scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;

scoped_ptr<MediaStreamManager> media_stream_manager_;