| 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> | 
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   169   // Must be created after the NotificationService. |   169   // Must be created after the NotificationService. | 
|   170   print_job_manager_.reset(new printing::PrintJobManager); |   170   print_job_manager_.reset(new printing::PrintJobManager); | 
|   171 #endif |   171 #endif | 
|   172  |   172  | 
|   173   net_log_.reset(new ChromeNetLog); |   173   net_log_.reset(new ChromeNetLog); | 
|   174  |   174  | 
|   175   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |   175   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 
|   176       extensions::kExtensionScheme); |   176       extensions::kExtensionScheme); | 
|   177   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |   177   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 
|   178       chrome::kExtensionResourceScheme); |   178       chrome::kExtensionResourceScheme); | 
 |   179   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 
 |   180       chrome::kChromeSearchScheme); | 
|   179  |   181  | 
|   180 #if defined(OS_MACOSX) |   182 #if defined(OS_MACOSX) | 
|   181   InitIdleMonitor(); |   183   InitIdleMonitor(); | 
|   182 #endif |   184 #endif | 
|   183  |   185  | 
|   184   extension_event_router_forwarder_ = new extensions::EventRouterForwarder; |   186   extension_event_router_forwarder_ = new extensions::EventRouterForwarder; | 
|   185  |   187  | 
|   186   ExtensionRendererState::GetInstance()->Init(); |   188   ExtensionRendererState::GetInstance()->Init(); | 
|   187  |   189  | 
|   188 #if defined(ENABLE_MESSAGE_CENTER) |   190 #if defined(ENABLE_MESSAGE_CENTER) | 
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1027 } |  1029 } | 
|  1028  |  1030  | 
|  1029 void BrowserProcessImpl::OnAutoupdateTimer() { |  1031 void BrowserProcessImpl::OnAutoupdateTimer() { | 
|  1030   if (CanAutorestartForUpdate()) { |  1032   if (CanAutorestartForUpdate()) { | 
|  1031     DLOG(WARNING) << "Detected update.  Restarting browser."; |  1033     DLOG(WARNING) << "Detected update.  Restarting browser."; | 
|  1032     RestartBackgroundInstance(); |  1034     RestartBackgroundInstance(); | 
|  1033   } |  1035   } | 
|  1034 } |  1036 } | 
|  1035  |  1037  | 
|  1036 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |  1038 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 
| OLD | NEW |