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

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

Issue 2119963002: Move mus to //services/ui (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/renderer_host/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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 #if defined(USE_NSS_CERTS) 187 #if defined(USE_NSS_CERTS)
188 #include "crypto/nss_util.h" 188 #include "crypto/nss_util.h"
189 #endif 189 #endif
190 190
191 #if defined(ENABLE_VULKAN) 191 #if defined(ENABLE_VULKAN)
192 #include "gpu/vulkan/vulkan_implementation.h" 192 #include "gpu/vulkan/vulkan_implementation.h"
193 #endif 193 #endif
194 194
195 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) 195 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
196 #include "components/mus/common/gpu_service.h" // nogncheck 196 #include "services/ui/common/gpu_service.h" // nogncheck
197 #endif 197 #endif
198 198
199 199
200 // One of the linux specific headers defines this as a macro. 200 // One of the linux specific headers defines this as a macro.
201 #ifdef DestroyAll 201 #ifdef DestroyAll
202 #undef DestroyAll 202 #undef DestroyAll
203 #endif 203 #endif
204 204
205 namespace content { 205 namespace content {
206 namespace { 206 namespace {
(...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 std::move(worker_task_runner), 1517 std::move(worker_task_runner),
1518 MediaInternals::GetInstance()); 1518 MediaInternals::GetInstance());
1519 } 1519 }
1520 CHECK(audio_manager_); 1520 CHECK(audio_manager_);
1521 1521
1522 if (use_hang_monitor) 1522 if (use_hang_monitor)
1523 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); 1523 media::AudioManager::StartHangMonitor(io_thread_->task_runner());
1524 } 1524 }
1525 1525
1526 } // namespace content 1526 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/renderer_host/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698