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

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

Issue 2895083004: memory-infra: rename service folder to memory_instrumentation (Closed)
Patch Set: comments Created 3 years, 7 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "media/base/media.h" 98 #include "media/base/media.h"
99 #include "media/base/user_input_monitor.h" 99 #include "media/base/user_input_monitor.h"
100 #include "media/midi/midi_service.h" 100 #include "media/midi/midi_service.h"
101 #include "media/mojo/features.h" 101 #include "media/mojo/features.h"
102 #include "mojo/edk/embedder/embedder.h" 102 #include "mojo/edk/embedder/embedder.h"
103 #include "mojo/edk/embedder/scoped_ipc_support.h" 103 #include "mojo/edk/embedder/scoped_ipc_support.h"
104 #include "net/base/network_change_notifier.h" 104 #include "net/base/network_change_notifier.h"
105 #include "net/socket/client_socket_factory.h" 105 #include "net/socket/client_socket_factory.h"
106 #include "net/ssl/ssl_config_service.h" 106 #include "net/ssl/ssl_config_service.h"
107 #include "ppapi/features/features.h" 107 #include "ppapi/features/features.h"
108 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" 108 #include "services/resource_coordinator/memory_instrumentation/coordinator_impl. h"
109 #include "services/service_manager/runner/common/client_util.h" 109 #include "services/service_manager/runner/common/client_util.h"
110 #include "skia/ext/event_tracer_impl.h" 110 #include "skia/ext/event_tracer_impl.h"
111 #include "skia/ext/skia_memory_dump_provider.h" 111 #include "skia/ext/skia_memory_dump_provider.h"
112 #include "sql/sql_memory_dump_provider.h" 112 #include "sql/sql_memory_dump_provider.h"
113 #include "ui/base/clipboard/clipboard.h" 113 #include "ui/base/clipboard/clipboard.h"
114 #include "ui/gfx/switches.h" 114 #include "ui/gfx/switches.h"
115 115
116 #if defined(USE_AURA) || defined(OS_MACOSX) 116 #if defined(USE_AURA) || defined(OS_MACOSX)
117 #include "content/browser/compositor/image_transport_factory.h" 117 #include "content/browser/compositor/image_transport_factory.h"
118 #endif 118 #endif
(...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after
1780 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1780 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
1781 MediaInternals::GetInstance()); 1781 MediaInternals::GetInstance());
1782 } 1782 }
1783 CHECK(audio_manager_); 1783 CHECK(audio_manager_);
1784 1784
1785 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); 1785 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
1786 CHECK(audio_system_); 1786 CHECK(audio_system_);
1787 } 1787 }
1788 1788
1789 } // namespace content 1789 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/gpu/browser_gpu_channel_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698