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

Side by Side Diff: chrome/service/service_process.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/service/DEPS ('k') | chrome/service/service_process_prefs.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/environment.h" 12 #include "base/environment.h"
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/prefs/json_pref_store.h"
19 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
20 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
22 #include "base/synchronization/waitable_event.h" 21 #include "base/synchronization/waitable_event.h"
23 #include "base/thread_task_runner_handle.h" 22 #include "base/thread_task_runner_handle.h"
24 #include "base/threading/sequenced_worker_pool.h" 23 #include "base/threading/sequenced_worker_pool.h"
25 #include "base/values.h" 24 #include "base/values.h"
26 #include "build/build_config.h" 25 #include "build/build_config.h"
27 #include "chrome/common/chrome_constants.h" 26 #include "chrome/common/chrome_constants.h"
28 #include "chrome/common/chrome_paths.h" 27 #include "chrome/common/chrome_paths.h"
29 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/env_vars.h" 29 #include "chrome/common/env_vars.h"
31 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
32 #include "chrome/common/service_process_util.h" 31 #include "chrome/common/service_process_util.h"
33 #include "chrome/grit/chromium_strings.h" 32 #include "chrome/grit/chromium_strings.h"
34 #include "chrome/grit/generated_resources.h" 33 #include "chrome/grit/generated_resources.h"
35 #include "chrome/service/cloud_print/cloud_print_message_handler.h" 34 #include "chrome/service/cloud_print/cloud_print_message_handler.h"
36 #include "chrome/service/cloud_print/cloud_print_proxy.h" 35 #include "chrome/service/cloud_print/cloud_print_proxy.h"
37 #include "chrome/service/net/service_url_request_context_getter.h" 36 #include "chrome/service/net/service_url_request_context_getter.h"
38 #include "chrome/service/service_process_prefs.h" 37 #include "chrome/service/service_process_prefs.h"
38 #include "components/prefs/json_pref_store.h"
39 #include "net/base/network_change_notifier.h" 39 #include "net/base/network_change_notifier.h"
40 #include "net/url_request/url_fetcher.h" 40 #include "net/url_request/url_fetcher.h"
41 #include "ui/base/l10n/l10n_util.h" 41 #include "ui/base/l10n/l10n_util.h"
42 #include "ui/base/resource/resource_bundle.h" 42 #include "ui/base/resource/resource_bundle.h"
43 #include "ui/base/ui_base_switches.h" 43 #include "ui/base/ui_base_switches.h"
44 44
45 #if defined(USE_GLIB) 45 #if defined(USE_GLIB)
46 #include <glib-object.h> 46 #include <glib-object.h>
47 #endif 47 #endif
48 48
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 } else { 363 } else {
364 Shutdown(); 364 Shutdown();
365 } 365 }
366 } 366 }
367 } 367 }
368 368
369 ServiceProcess::~ServiceProcess() { 369 ServiceProcess::~ServiceProcess() {
370 Teardown(); 370 Teardown();
371 g_service_process = NULL; 371 g_service_process = NULL;
372 } 372 }
OLDNEW
« no previous file with comments | « chrome/service/DEPS ('k') | chrome/service/service_process_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698