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

Side by Side Diff: chrome/browser/browser_process_impl.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/browser/browser_process_impl.h ('k') | chrome/browser/browser_shutdown.cc » ('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/browser/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/atomic_ref_count.h" 13 #include "base/atomic_ref_count.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/bind_helpers.h" 15 #include "base/bind_helpers.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/debug/alias.h" 17 #include "base/debug/alias.h"
18 #include "base/debug/leak_annotations.h" 18 #include "base/debug/leak_annotations.h"
19 #include "base/files/file_path.h" 19 #include "base/files/file_path.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/metrics/field_trial.h" 21 #include "base/metrics/field_trial.h"
22 #include "base/metrics/histogram_macros.h" 22 #include "base/metrics/histogram_macros.h"
23 #include "base/path_service.h" 23 #include "base/path_service.h"
24 #include "base/prefs/json_pref_store.h"
25 #include "base/prefs/pref_registry_simple.h"
26 #include "base/prefs/pref_service.h"
27 #include "base/synchronization/waitable_event.h" 24 #include "base/synchronization/waitable_event.h"
28 #include "base/threading/thread.h" 25 #include "base/threading/thread.h"
29 #include "base/threading/thread_restrictions.h" 26 #include "base/threading/thread_restrictions.h"
30 #include "base/time/default_tick_clock.h" 27 #include "base/time/default_tick_clock.h"
31 #include "base/trace_event/trace_event.h" 28 #include "base/trace_event/trace_event.h"
32 #include "build/build_config.h" 29 #include "build/build_config.h"
33 #include "chrome/browser/chrome_browser_main.h" 30 #include "chrome/browser/chrome_browser_main.h"
34 #include "chrome/browser/chrome_child_process_watcher.h" 31 #include "chrome/browser/chrome_child_process_watcher.h"
35 #include "chrome/browser/chrome_content_browser_client.h" 32 #include "chrome/browser/chrome_content_browser_client.h"
36 #include "chrome/browser/chrome_device_client.h" 33 #include "chrome/browser/chrome_device_client.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "chrome/installer/util/google_update_constants.h" 77 #include "chrome/installer/util/google_update_constants.h"
81 #include "chrome/installer/util/google_update_settings.h" 78 #include "chrome/installer/util/google_update_settings.h"
82 #include "components/component_updater/component_updater_service.h" 79 #include "components/component_updater/component_updater_service.h"
83 #include "components/gcm_driver/gcm_driver.h" 80 #include "components/gcm_driver/gcm_driver.h"
84 #include "components/metrics/metrics_pref_names.h" 81 #include "components/metrics/metrics_pref_names.h"
85 #include "components/metrics/metrics_service.h" 82 #include "components/metrics/metrics_service.h"
86 #include "components/metrics_services_manager/metrics_services_manager.h" 83 #include "components/metrics_services_manager/metrics_services_manager.h"
87 #include "components/net_log/chrome_net_log.h" 84 #include "components/net_log/chrome_net_log.h"
88 #include "components/network_time/network_time_tracker.h" 85 #include "components/network_time/network_time_tracker.h"
89 #include "components/policy/core/common/policy_service.h" 86 #include "components/policy/core/common/policy_service.h"
87 #include "components/prefs/json_pref_store.h"
88 #include "components/prefs/pref_registry_simple.h"
89 #include "components/prefs/pref_service.h"
90 #include "components/safe_json/safe_json_parser.h" 90 #include "components/safe_json/safe_json_parser.h"
91 #include "components/signin/core/common/profile_management_switches.h" 91 #include "components/signin/core/common/profile_management_switches.h"
92 #include "components/translate/core/browser/translate_download_manager.h" 92 #include "components/translate/core/browser/translate_download_manager.h"
93 #include "components/update_client/update_query_params.h" 93 #include "components/update_client/update_query_params.h"
94 #include "components/web_resource/promo_resource_service.h" 94 #include "components/web_resource/promo_resource_service.h"
95 #include "components/web_resource/web_resource_pref_names.h" 95 #include "components/web_resource/web_resource_pref_names.h"
96 #include "content/public/browser/browser_thread.h" 96 #include "content/public/browser/browser_thread.h"
97 #include "content/public/browser/child_process_security_policy.h" 97 #include "content/public/browser/child_process_security_policy.h"
98 #include "content/public/browser/notification_details.h" 98 #include "content/public/browser/notification_details.h"
99 #include "content/public/browser/plugin_service.h" 99 #include "content/public/browser/plugin_service.h"
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 } 1276 }
1277 1277
1278 void BrowserProcessImpl::OnAutoupdateTimer() { 1278 void BrowserProcessImpl::OnAutoupdateTimer() {
1279 if (CanAutorestartForUpdate()) { 1279 if (CanAutorestartForUpdate()) {
1280 DLOG(WARNING) << "Detected update. Restarting browser."; 1280 DLOG(WARNING) << "Detected update. Restarting browser.";
1281 RestartBackgroundInstance(); 1281 RestartBackgroundInstance();
1282 } 1282 }
1283 } 1283 }
1284 1284
1285 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1285 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698