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

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

Issue 2768343002: Change namespace from ui to gfx for NativePixmap related code (Closed)
Patch Set: Addressed sadrul's remark Created 3 years, 9 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
« no previous file with comments | « components/exo/display_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 namespace edk { 61 namespace edk {
62 class ScopedIPCSupport; 62 class ScopedIPCSupport;
63 } // namespace edk 63 } // namespace edk
64 } // namespace mojo 64 } // namespace mojo
65 65
66 namespace net { 66 namespace net {
67 class NetworkChangeNotifier; 67 class NetworkChangeNotifier;
68 } // namespace net 68 } // namespace net
69 69
70 #if defined(USE_OZONE) 70 #if defined(USE_OZONE)
71 namespace ui { 71 namespace gfx {
72 class ClientNativePixmapFactory; 72 class ClientNativePixmapFactory;
73 } // namespace ui 73 } // namespace gfx
74 #endif 74 #endif
75 75
76 namespace content { 76 namespace content {
77 class AudioManagerThread; 77 class AudioManagerThread;
78 class BrowserMainParts; 78 class BrowserMainParts;
79 class BrowserOnlineStateObserver; 79 class BrowserOnlineStateObserver;
80 class BrowserThreadImpl; 80 class BrowserThreadImpl;
81 class LoaderDelegateImpl; 81 class LoaderDelegateImpl;
82 class MediaStreamManager; 82 class MediaStreamManager;
83 class ResourceDispatcherHostImpl; 83 class ResourceDispatcherHostImpl;
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 std::unique_ptr<midi::MidiService> midi_service_; 299 std::unique_ptr<midi::MidiService> midi_service_;
300 300
301 #if defined(OS_WIN) 301 #if defined(OS_WIN)
302 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_; 302 std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
303 #elif defined(OS_LINUX) && defined(USE_UDEV) 303 #elif defined(OS_LINUX) && defined(USE_UDEV)
304 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_; 304 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
305 #elif defined(OS_MACOSX) && !defined(OS_IOS) 305 #elif defined(OS_MACOSX) && !defined(OS_IOS)
306 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; 306 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
307 #endif 307 #endif
308 #if defined(USE_OZONE) 308 #if defined(USE_OZONE)
309 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 309 std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
310 #endif 310 #endif
311 311
312 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; 312 std::unique_ptr<LoaderDelegateImpl> loader_delegate_;
313 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 313 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
314 std::unique_ptr<MediaStreamManager> media_stream_manager_; 314 std::unique_ptr<MediaStreamManager> media_stream_manager_;
315 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; 315 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
316 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> 316 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
317 discardable_shared_memory_manager_; 317 discardable_shared_memory_manager_;
318 scoped_refptr<SaveFileManager> save_file_manager_; 318 scoped_refptr<SaveFileManager> save_file_manager_;
319 std::unique_ptr<memory_instrumentation::CoordinatorImpl> 319 std::unique_ptr<memory_instrumentation::CoordinatorImpl>
320 memory_instrumentation_coordinator_; 320 memory_instrumentation_coordinator_;
321 321
322 // DO NOT add members here. Add them to the right categories above. 322 // DO NOT add members here. Add them to the right categories above.
323 323
324 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 324 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
325 }; 325 };
326 326
327 } // namespace content 327 } // namespace content
328 328
329 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 329 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « components/exo/display_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698