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

Side by Side 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, 4 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 21 matching lines...) Expand all
32 class UserInputMonitor; 32 class UserInputMonitor;
33 namespace midi { 33 namespace midi {
34 class MidiManager; 34 class MidiManager;
35 } // namespace midi 35 } // namespace midi
36 } // namespace media 36 } // namespace media
37 37
38 namespace net { 38 namespace net {
39 class NetworkChangeNotifier; 39 class NetworkChangeNotifier;
40 } // namespace net 40 } // namespace net
41 41
42 #if defined(USE_OZONE)
43 namespace ui {
44 class ClientNativePixmapManager;
45 } // namespace ui
46 #endif
47
42 namespace content { 48 namespace content {
43 class BrowserMainParts; 49 class BrowserMainParts;
44 class BrowserOnlineStateObserver; 50 class BrowserOnlineStateObserver;
45 class BrowserShutdownImpl; 51 class BrowserShutdownImpl;
46 class BrowserThreadImpl; 52 class BrowserThreadImpl;
47 class MediaStreamManager; 53 class MediaStreamManager;
48 class MojoShellContext; 54 class MojoShellContext;
49 class ResourceDispatcherHostImpl; 55 class ResourceDispatcherHostImpl;
50 class SpeechRecognitionManagerImpl; 56 class SpeechRecognitionManagerImpl;
51 class StartupTaskRunner; 57 class StartupTaskRunner;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 scoped_ptr<media::UserInputMonitor> user_input_monitor_; 244 scoped_ptr<media::UserInputMonitor> user_input_monitor_;
239 scoped_ptr<media::AudioManager> audio_manager_; 245 scoped_ptr<media::AudioManager> audio_manager_;
240 246
241 scoped_ptr<media::midi::MidiManager> midi_manager_; 247 scoped_ptr<media::midi::MidiManager> midi_manager_;
242 248
243 #if defined(USE_UDEV) 249 #if defined(USE_UDEV)
244 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_; 250 scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
245 #elif defined(OS_MACOSX) && !defined(OS_IOS) 251 #elif defined(OS_MACOSX) && !defined(OS_IOS)
246 scoped_ptr<DeviceMonitorMac> device_monitor_mac_; 252 scoped_ptr<DeviceMonitorMac> device_monitor_mac_;
247 #endif 253 #endif
254 #if defined(USE_OZONE)
255 scoped_ptr<ui::ClientNativePixmapManager> client_native_pixmap_manager_;
256 #endif
248 257
249 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 258 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
250 scoped_ptr<MediaStreamManager> media_stream_manager_; 259 scoped_ptr<MediaStreamManager> media_stream_manager_;
251 scoped_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; 260 scoped_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
252 scoped_ptr<TimeZoneMonitor> time_zone_monitor_; 261 scoped_ptr<TimeZoneMonitor> time_zone_monitor_;
253 262
254 // DO NOT add members here. Add them to the right categories above. 263 // DO NOT add members here. Add them to the right categories above.
255 264
256 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 265 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
257 }; 266 };
258 267
259 } // namespace content 268 } // namespace content
260 269
261 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 270 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698