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 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
30 #include "chrome/common/env_vars.h" | 30 #include "chrome/common/env_vars.h" |
31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
32 #include "chrome/common/service_process_util.h" | 32 #include "chrome/common/service_process_util.h" |
33 #include "chrome/grit/chromium_strings.h" | 33 #include "chrome/grit/chromium_strings.h" |
34 #include "chrome/grit/generated_resources.h" | 34 #include "chrome/grit/generated_resources.h" |
35 #include "chrome/service/cloud_print/cloud_print_message_handler.h" | 35 #include "chrome/service/cloud_print/cloud_print_message_handler.h" |
36 #include "chrome/service/cloud_print/cloud_print_proxy.h" | 36 #include "chrome/service/cloud_print/cloud_print_proxy.h" |
37 #include "chrome/service/net/service_url_request_context_getter.h" | 37 #include "chrome/service/net/service_url_request_context_getter.h" |
38 #include "chrome/service/service_process_prefs.h" | 38 #include "chrome/service/service_process_prefs.h" |
| 39 #include "components/network_session_configurator/switches.h" |
39 #include "components/prefs/json_pref_store.h" | 40 #include "components/prefs/json_pref_store.h" |
40 #include "net/base/network_change_notifier.h" | 41 #include "net/base/network_change_notifier.h" |
41 #include "net/url_request/url_fetcher.h" | 42 #include "net/url_request/url_fetcher.h" |
42 #include "ui/base/l10n/l10n_util.h" | 43 #include "ui/base/l10n/l10n_util.h" |
43 #include "ui/base/material_design/material_design_controller.h" | 44 #include "ui/base/material_design/material_design_controller.h" |
44 #include "ui/base/resource/resource_bundle.h" | 45 #include "ui/base/resource/resource_bundle.h" |
45 #include "ui/base/ui_base_switches.h" | 46 #include "ui/base/ui_base_switches.h" |
46 | 47 |
47 #if defined(USE_GLIB) | 48 #if defined(USE_GLIB) |
48 #include <glib-object.h> | 49 #include <glib-object.h> |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 } else { | 367 } else { |
367 Shutdown(); | 368 Shutdown(); |
368 } | 369 } |
369 } | 370 } |
370 } | 371 } |
371 | 372 |
372 ServiceProcess::~ServiceProcess() { | 373 ServiceProcess::~ServiceProcess() { |
373 Teardown(); | 374 Teardown(); |
374 g_service_process = NULL; | 375 g_service_process = NULL; |
375 } | 376 } |
OLD | NEW |