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

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

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/media/capture/DEPS » ('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 #include "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 #if defined(OS_CHROMEOS) 145 #if defined(OS_CHROMEOS)
146 #include "base/memory/memory_pressure_monitor_chromeos.h" 146 #include "base/memory/memory_pressure_monitor_chromeos.h"
147 #include "chromeos/chromeos_switches.h" 147 #include "chromeos/chromeos_switches.h"
148 #endif 148 #endif
149 149
150 #if defined(USE_GLIB) 150 #if defined(USE_GLIB)
151 #include <glib-object.h> 151 #include <glib-object.h>
152 #endif 152 #endif
153 153
154 #if defined(OS_WIN) 154 #if defined(OS_WIN)
155 #include "media/capture/system_message_window_win.h" 155 #include "device/capture/system_message_window_win.h"
156 #elif defined(OS_LINUX) && defined(USE_UDEV) 156 #elif defined(OS_LINUX) && defined(USE_UDEV)
157 #include "media/capture/device_monitor_udev.h" 157 #include "device/capture/device_monitor_udev.h"
158 #elif defined(OS_MACOSX) 158 #elif defined(OS_MACOSX)
159 #include "media/capture/device_monitor_mac.h" 159 #include "device/capture/device_monitor_mac.h"
160 #endif 160 #endif
161 161
162 #if defined(OS_POSIX) && !defined(OS_MACOSX) 162 #if defined(OS_POSIX) && !defined(OS_MACOSX)
163 #include "content/browser/renderer_host/render_sandbox_host_linux.h" 163 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
164 #include "content/browser/zygote_host/zygote_host_impl_linux.h" 164 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
165 165
166 #if !defined(OS_ANDROID) 166 #if !defined(OS_ANDROID)
167 #include "content/public/browser/zygote_handle_linux.h" 167 #include "content/public/browser/zygote_handle_linux.h"
168 #endif // !defined(OS_ANDROID) 168 #endif // !defined(OS_ANDROID)
169 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 169 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1507 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1507 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1508 audio_thread_->task_runner(); 1508 audio_thread_->task_runner();
1509 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1509 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1510 std::move(worker_task_runner), 1510 std::move(worker_task_runner),
1511 MediaInternals::GetInstance()); 1511 MediaInternals::GetInstance());
1512 } 1512 }
1513 CHECK(audio_manager_); 1513 CHECK(audio_manager_);
1514 } 1514 }
1515 1515
1516 } // namespace content 1516 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/media/capture/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698