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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 <utility> 9 #include <utility>
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "device/battery/battery_status_service.h" 76 #include "device/battery/battery_status_service.h"
77 #include "ipc/mojo/scoped_ipc_support.h" 77 #include "ipc/mojo/scoped_ipc_support.h"
78 #include "media/audio/audio_manager.h" 78 #include "media/audio/audio_manager.h"
79 #include "media/base/media.h" 79 #include "media/base/media.h"
80 #include "media/base/user_input_monitor.h" 80 #include "media/base/user_input_monitor.h"
81 #include "media/midi/midi_manager.h" 81 #include "media/midi/midi_manager.h"
82 #include "mojo/edk/embedder/embedder.h" 82 #include "mojo/edk/embedder/embedder.h"
83 #include "net/base/network_change_notifier.h" 83 #include "net/base/network_change_notifier.h"
84 #include "net/socket/client_socket_factory.h" 84 #include "net/socket/client_socket_factory.h"
85 #include "net/ssl/ssl_config_service.h" 85 #include "net/ssl/ssl_config_service.h"
86 #include "services/shell/public/cpp/shell.h"
87 #include "skia/ext/event_tracer_impl.h" 86 #include "skia/ext/event_tracer_impl.h"
88 #include "skia/ext/skia_memory_dump_provider.h" 87 #include "skia/ext/skia_memory_dump_provider.h"
89 #include "sql/sql_memory_dump_provider.h" 88 #include "sql/sql_memory_dump_provider.h"
90 #include "ui/base/clipboard/clipboard.h" 89 #include "ui/base/clipboard/clipboard.h"
91 90
92 #if defined(USE_AURA) || defined(OS_MACOSX) 91 #if defined(USE_AURA) || defined(OS_MACOSX)
93 #include "content/browser/compositor/image_transport_factory.h" 92 #include "content/browser/compositor/image_transport_factory.h"
94 #endif 93 #endif
95 94
96 #if defined(USE_AURA) 95 #if defined(USE_AURA)
(...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 DCHECK(is_tracing_startup_for_duration_); 1449 DCHECK(is_tracing_startup_for_duration_);
1451 1450
1452 is_tracing_startup_for_duration_ = false; 1451 is_tracing_startup_for_duration_ = false;
1453 TracingController::GetInstance()->StopTracing( 1452 TracingController::GetInstance()->StopTracing(
1454 TracingController::CreateFileSink( 1453 TracingController::CreateFileSink(
1455 startup_trace_file_, 1454 startup_trace_file_,
1456 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1455 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1457 } 1456 }
1458 1457
1459 } // namespace content 1458 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/dom_storage/dom_storage_context_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698