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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 #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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "device/time_zone_monitor/time_zone_monitor.h" 82 #include "device/time_zone_monitor/time_zone_monitor.h"
83 #include "media/base/media.h" 83 #include "media/base/media.h"
84 #include "media/base/user_input_monitor.h" 84 #include "media/base/user_input_monitor.h"
85 #include "media/midi/midi_manager.h" 85 #include "media/midi/midi_manager.h"
86 #include "mojo/edk/embedder/embedder.h" 86 #include "mojo/edk/embedder/embedder.h"
87 #include "mojo/edk/embedder/scoped_ipc_support.h" 87 #include "mojo/edk/embedder/scoped_ipc_support.h"
88 #include "net/base/network_change_notifier.h" 88 #include "net/base/network_change_notifier.h"
89 #include "net/socket/client_socket_factory.h" 89 #include "net/socket/client_socket_factory.h"
90 #include "net/ssl/ssl_config_service.h" 90 #include "net/ssl/ssl_config_service.h"
91 #include "ppapi/features/features.h" 91 #include "ppapi/features/features.h"
92 #include "services/shell/runner/common/client_util.h" 92 #include "services/service_manager/runner/common/client_util.h"
93 #include "skia/ext/event_tracer_impl.h" 93 #include "skia/ext/event_tracer_impl.h"
94 #include "skia/ext/skia_memory_dump_provider.h" 94 #include "skia/ext/skia_memory_dump_provider.h"
95 #include "sql/sql_memory_dump_provider.h" 95 #include "sql/sql_memory_dump_provider.h"
96 #include "ui/base/clipboard/clipboard.h" 96 #include "ui/base/clipboard/clipboard.h"
97 97
98 #if defined(USE_AURA) || defined(OS_MACOSX) 98 #if defined(USE_AURA) || defined(OS_MACOSX)
99 #include "content/browser/compositor/image_transport_factory.h" 99 #include "content/browser/compositor/image_transport_factory.h"
100 #endif 100 #endif
101 101
102 #if defined(USE_AURA) 102 #if defined(USE_AURA)
(...skipping 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1566 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1567 audio_thread_->task_runner(); 1567 audio_thread_->task_runner();
1568 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1568 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1569 std::move(worker_task_runner), 1569 std::move(worker_task_runner),
1570 MediaInternals::GetInstance()); 1570 MediaInternals::GetInstance());
1571 } 1571 }
1572 CHECK(audio_manager_); 1572 CHECK(audio_manager_);
1573 } 1573 }
1574 1574
1575 } // namespace content 1575 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698