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/browser/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
| 12 #include "apps/shell_integration.h" |
12 #include "base/bind.h" | 13 #include "base/bind.h" |
13 #include "base/bind_helpers.h" | 14 #include "base/bind_helpers.h" |
14 #include "base/command_line.h" | 15 #include "base/command_line.h" |
15 #include "base/debug/alias.h" | 16 #include "base/debug/alias.h" |
16 #include "base/file_util.h" | 17 #include "base/file_util.h" |
17 #include "base/path_service.h" | 18 #include "base/path_service.h" |
18 #include "base/prefs/json_pref_store.h" | 19 #include "base/prefs/json_pref_store.h" |
19 #include "base/prefs/pref_registry_simple.h" | 20 #include "base/prefs/pref_registry_simple.h" |
20 #include "base/prefs/pref_service.h" | 21 #include "base/prefs/pref_service.h" |
21 #include "base/synchronization/waitable_event.h" | 22 #include "base/synchronization/waitable_event.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 #include "chrome/browser/policy/policy_service.h" | 54 #include "chrome/browser/policy/policy_service.h" |
54 #include "chrome/browser/prefs/browser_prefs.h" | 55 #include "chrome/browser/prefs/browser_prefs.h" |
55 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 56 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
56 #include "chrome/browser/prerender/prerender_tracker.h" | 57 #include "chrome/browser/prerender/prerender_tracker.h" |
57 #include "chrome/browser/printing/background_printing_manager.h" | 58 #include "chrome/browser/printing/background_printing_manager.h" |
58 #include "chrome/browser/printing/print_job_manager.h" | 59 #include "chrome/browser/printing/print_job_manager.h" |
59 #include "chrome/browser/printing/print_preview_dialog_controller.h" | 60 #include "chrome/browser/printing/print_preview_dialog_controller.h" |
60 #include "chrome/browser/profiles/profile_manager.h" | 61 #include "chrome/browser/profiles/profile_manager.h" |
61 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 62 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" |
62 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 63 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
63 #include "chrome/browser/shell_integration.h" | |
64 #include "chrome/browser/status_icons/status_tray.h" | 64 #include "chrome/browser/status_icons/status_tray.h" |
65 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" | 65 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" |
66 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" | 66 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" |
67 #include "chrome/browser/ui/browser_finder.h" | 67 #include "chrome/browser/ui/browser_finder.h" |
68 #include "chrome/browser/web_resource/promo_resource_service.h" | 68 #include "chrome/browser/web_resource/promo_resource_service.h" |
69 #include "chrome/common/chrome_constants.h" | 69 #include "chrome/common/chrome_constants.h" |
70 #include "chrome/common/chrome_notification_types.h" | 70 #include "chrome/common/chrome_notification_types.h" |
71 #include "chrome/common/chrome_paths.h" | 71 #include "chrome/common/chrome_paths.h" |
72 #include "chrome/common/chrome_switches.h" | 72 #include "chrome/common/chrome_switches.h" |
73 #include "chrome/common/extensions/extension_l10n_util.h" | 73 #include "chrome/common/extensions/extension_l10n_util.h" |
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 } | 1032 } |
1033 | 1033 |
1034 void BrowserProcessImpl::OnAutoupdateTimer() { | 1034 void BrowserProcessImpl::OnAutoupdateTimer() { |
1035 if (CanAutorestartForUpdate()) { | 1035 if (CanAutorestartForUpdate()) { |
1036 DLOG(WARNING) << "Detected update. Restarting browser."; | 1036 DLOG(WARNING) << "Detected update. Restarting browser."; |
1037 RestartBackgroundInstance(); | 1037 RestartBackgroundInstance(); |
1038 } | 1038 } |
1039 } | 1039 } |
1040 | 1040 |
1041 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1041 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |