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

Side by Side Diff: content/browser/utility_process_host_impl.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/utility_process_host_impl.h" 5 #include "content/browser/utility_process_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/public/browser/content_browser_client.h" 32 #include "content/public/browser/content_browser_client.h"
33 #include "content/public/browser/utility_process_host_client.h" 33 #include "content/public/browser/utility_process_host_client.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "content/public/common/mojo_channel_switches.h" 35 #include "content/public/common/mojo_channel_switches.h"
36 #include "content/public/common/process_type.h" 36 #include "content/public/common/process_type.h"
37 #include "content/public/common/sandbox_type.h" 37 #include "content/public/common/sandbox_type.h"
38 #include "content/public/common/sandboxed_process_launcher_delegate.h" 38 #include "content/public/common/sandboxed_process_launcher_delegate.h"
39 #include "content/public/common/service_manager_connection.h" 39 #include "content/public/common/service_manager_connection.h"
40 #include "content/public/common/service_names.h" 40 #include "content/public/common/service_names.h"
41 #include "mojo/edk/embedder/embedder.h" 41 #include "mojo/edk/embedder/embedder.h"
42 #include "services/shell/public/cpp/connection.h" 42 #include "services/service_manager/public/cpp/connection.h"
43 #include "services/shell/public/cpp/interface_provider.h" 43 #include "services/service_manager/public/cpp/interface_provider.h"
44 #include "ui/base/ui_base_switches.h" 44 #include "ui/base/ui_base_switches.h"
45 45
46 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) 46 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
47 #include "content/public/browser/zygote_handle_linux.h" 47 #include "content/public/browser/zygote_handle_linux.h"
48 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) 48 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
49 49
50 #if defined(OS_WIN) 50 #if defined(OS_WIN)
51 #include "sandbox/win/src/sandbox_policy.h" 51 #include "sandbox/win/src/sandbox_policy.h"
52 #include "sandbox/win/src/sandbox_types.h" 52 #include "sandbox/win/src/sandbox_types.h"
53 #endif 53 #endif
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 base::WeakPtr<UtilityProcessHostImpl> host, 397 base::WeakPtr<UtilityProcessHostImpl> host,
398 int error_code) { 398 int error_code) {
399 if (!host) 399 if (!host)
400 return; 400 return;
401 401
402 host->OnProcessLaunchFailed(error_code); 402 host->OnProcessLaunchFailed(error_code);
403 delete host.get(); 403 delete host.get();
404 } 404 }
405 405
406 } // namespace content 406 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698