| OLD | NEW |
| 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 "chrome/service/service_process.h" | 5 #include "chrome/service/service_process.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
| 36 #include "chrome/common/env_vars.h" | 36 #include "chrome/common/env_vars.h" |
| 37 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
| 38 #include "chrome/common/service_process_util.h" | 38 #include "chrome/common/service_process_util.h" |
| 39 #include "chrome/grit/chromium_strings.h" | 39 #include "chrome/grit/chromium_strings.h" |
| 40 #include "chrome/grit/generated_resources.h" | 40 #include "chrome/grit/generated_resources.h" |
| 41 #include "chrome/service/cloud_print/cloud_print_message_handler.h" | 41 #include "chrome/service/cloud_print/cloud_print_message_handler.h" |
| 42 #include "chrome/service/cloud_print/cloud_print_proxy.h" | 42 #include "chrome/service/cloud_print/cloud_print_proxy.h" |
| 43 #include "chrome/service/net/service_url_request_context_getter.h" | 43 #include "chrome/service/net/service_url_request_context_getter.h" |
| 44 #include "chrome/service/service_process_prefs.h" | 44 #include "chrome/service/service_process_prefs.h" |
| 45 #include "components/network_session_configurator/common/network_switches.h" |
| 45 #include "components/prefs/json_pref_store.h" | 46 #include "components/prefs/json_pref_store.h" |
| 46 #include "mojo/edk/embedder/embedder.h" | 47 #include "mojo/edk/embedder/embedder.h" |
| 47 #include "mojo/edk/embedder/named_platform_handle.h" | 48 #include "mojo/edk/embedder/named_platform_handle.h" |
| 48 #include "mojo/edk/embedder/named_platform_handle_utils.h" | 49 #include "mojo/edk/embedder/named_platform_handle_utils.h" |
| 49 #include "mojo/edk/embedder/peer_connection.h" | 50 #include "mojo/edk/embedder/peer_connection.h" |
| 50 #include "mojo/edk/embedder/platform_handle_utils.h" | 51 #include "mojo/edk/embedder/platform_handle_utils.h" |
| 51 #include "mojo/edk/embedder/scoped_ipc_support.h" | 52 #include "mojo/edk/embedder/scoped_ipc_support.h" |
| 52 #include "net/base/network_change_notifier.h" | 53 #include "net/base/network_change_notifier.h" |
| 53 #include "net/url_request/url_fetcher.h" | 54 #include "net/url_request/url_fetcher.h" |
| 54 #include "ui/base/l10n/l10n_util.h" | 55 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 453 } else { | 454 } else { |
| 454 Shutdown(); | 455 Shutdown(); |
| 455 } | 456 } |
| 456 } | 457 } |
| 457 } | 458 } |
| 458 | 459 |
| 459 ServiceProcess::~ServiceProcess() { | 460 ServiceProcess::~ServiceProcess() { |
| 460 Teardown(); | 461 Teardown(); |
| 461 g_service_process = NULL; | 462 g_service_process = NULL; |
| 462 } | 463 } |
| OLD | NEW |