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

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

Issue 2074453003: Move ScopedIPCSupport to mojo/edk/embedder and the mojo::edk namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
« no previous file with comments | « content/browser/BUILD.gn ('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 17 matching lines...) Expand all
28 class HighResolutionTimerManager; 28 class HighResolutionTimerManager;
29 class MessageLoop; 29 class MessageLoop;
30 class PowerMonitor; 30 class PowerMonitor;
31 class SystemMonitor; 31 class SystemMonitor;
32 class MemoryPressureMonitor; 32 class MemoryPressureMonitor;
33 namespace trace_event { 33 namespace trace_event {
34 class TraceEventSystemStatsMonitor; 34 class TraceEventSystemStatsMonitor;
35 } // namespace trace_event 35 } // namespace trace_event
36 } // namespace base 36 } // namespace base
37 37
38 namespace IPC {
39 class ScopedIPCSupport;
40 }
41
42 namespace media { 38 namespace media {
43 #if defined(OS_WIN) 39 #if defined(OS_WIN)
44 class SystemMessageWindowWin; 40 class SystemMessageWindowWin;
45 #elif defined(OS_LINUX) && defined(USE_UDEV) 41 #elif defined(OS_LINUX) && defined(USE_UDEV)
46 class DeviceMonitorLinux; 42 class DeviceMonitorLinux;
47 #endif 43 #endif
48 class UserInputMonitor; 44 class UserInputMonitor;
49 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
50 class DeviceMonitorMac; 46 class DeviceMonitorMac;
51 #endif 47 #endif
52 namespace midi { 48 namespace midi {
53 class MidiManager; 49 class MidiManager;
54 } // namespace midi 50 } // namespace midi
55 } // namespace media 51 } // namespace media
56 52
53 namespace mojo {
54 namespace edk {
55 class ScopedIPCSupport;
56 } // namespace edk
57 } // namespace mojo
58
57 namespace net { 59 namespace net {
58 class NetworkChangeNotifier; 60 class NetworkChangeNotifier;
59 } // namespace net 61 } // namespace net
60 62
61 #if defined(USE_OZONE) 63 #if defined(USE_OZONE)
62 namespace ui { 64 namespace ui {
63 class ClientNativePixmapFactory; 65 class ClientNativePixmapFactory;
64 } // namespace ui 66 } // namespace ui
65 #endif 67 #endif
66 68
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 std::unique_ptr<BrowserProcessSubThread> db_thread_; 253 std::unique_ptr<BrowserProcessSubThread> db_thread_;
252 std::unique_ptr<BrowserProcessSubThread> file_user_blocking_thread_; 254 std::unique_ptr<BrowserProcessSubThread> file_user_blocking_thread_;
253 std::unique_ptr<BrowserProcessSubThread> file_thread_; 255 std::unique_ptr<BrowserProcessSubThread> file_thread_;
254 std::unique_ptr<BrowserProcessSubThread> process_launcher_thread_; 256 std::unique_ptr<BrowserProcessSubThread> process_launcher_thread_;
255 std::unique_ptr<BrowserProcessSubThread> cache_thread_; 257 std::unique_ptr<BrowserProcessSubThread> cache_thread_;
256 std::unique_ptr<BrowserProcessSubThread> io_thread_; 258 std::unique_ptr<BrowserProcessSubThread> io_thread_;
257 259
258 // Members initialized in |BrowserThreadsStarted()| -------------------------- 260 // Members initialized in |BrowserThreadsStarted()| --------------------------
259 std::unique_ptr<base::Thread> indexed_db_thread_; 261 std::unique_ptr<base::Thread> indexed_db_thread_;
260 std::unique_ptr<MojoShellContext> mojo_shell_context_; 262 std::unique_ptr<MojoShellContext> mojo_shell_context_;
261 std::unique_ptr<IPC::ScopedIPCSupport> mojo_ipc_support_; 263 std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
262 264
263 // |user_input_monitor_| has to outlive |audio_manager_|, so declared first. 265 // |user_input_monitor_| has to outlive |audio_manager_|, so declared first.
264 std::unique_ptr<media::UserInputMonitor> user_input_monitor_; 266 std::unique_ptr<media::UserInputMonitor> user_input_monitor_;
265 // AudioThread needs to outlive |audio_manager_|. 267 // AudioThread needs to outlive |audio_manager_|.
266 std::unique_ptr<base::Thread> audio_thread_; 268 std::unique_ptr<base::Thread> audio_thread_;
267 media::ScopedAudioManagerPtr audio_manager_; 269 media::ScopedAudioManagerPtr audio_manager_;
268 270
269 std::unique_ptr<media::midi::MidiManager> midi_manager_; 271 std::unique_ptr<media::midi::MidiManager> midi_manager_;
270 272
271 #if defined(OS_WIN) 273 #if defined(OS_WIN)
(...skipping 13 matching lines...) Expand all
285 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_; 287 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_;
286 288
287 // DO NOT add members here. Add them to the right categories above. 289 // DO NOT add members here. Add them to the right categories above.
288 290
289 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 291 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
290 }; 292 };
291 293
292 } // namespace content 294 } // namespace content
293 295
294 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 296 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698