OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
907 | 907 |
908 void BrowserProcessImpl::CreateIconManager() { | 908 void BrowserProcessImpl::CreateIconManager() { |
909 DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL); | 909 DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL); |
910 created_icon_manager_ = true; | 910 created_icon_manager_ = true; |
911 icon_manager_.reset(new IconManager); | 911 icon_manager_.reset(new IconManager); |
912 } | 912 } |
913 | 913 |
914 void BrowserProcessImpl::CreateDevToolsManager() { | 914 void BrowserProcessImpl::CreateDevToolsManager() { |
915 DCHECK(devtools_manager_.get() == NULL); | 915 DCHECK(devtools_manager_.get() == NULL); |
916 created_devtools_manager_ = true; | 916 created_devtools_manager_ = true; |
917 devtools_manager_ = new DevToolsManager(); | 917 devtools_manager_.reset(new DevToolsManager()); |
918 } | 918 } |
919 | 919 |
920 void BrowserProcessImpl::CreateSidebarManager() { | 920 void BrowserProcessImpl::CreateSidebarManager() { |
921 DCHECK(sidebar_manager_.get() == NULL); | 921 DCHECK(sidebar_manager_.get() == NULL); |
922 created_sidebar_manager_ = true; | 922 created_sidebar_manager_ = true; |
923 sidebar_manager_ = new SidebarManager(); | 923 sidebar_manager_ = new SidebarManager(); |
924 } | 924 } |
925 | 925 |
926 void BrowserProcessImpl::CreateGoogleURLTracker() { | 926 void BrowserProcessImpl::CreateGoogleURLTracker() { |
927 DCHECK(google_url_tracker_.get() == NULL); | 927 DCHECK(google_url_tracker_.get() == NULL); |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1118 } | 1118 } |
1119 | 1119 |
1120 void BrowserProcessImpl::OnAutoupdateTimer() { | 1120 void BrowserProcessImpl::OnAutoupdateTimer() { |
1121 if (CanAutorestartForUpdate()) { | 1121 if (CanAutorestartForUpdate()) { |
1122 DLOG(WARNING) << "Detected update. Restarting browser."; | 1122 DLOG(WARNING) << "Detected update. Restarting browser."; |
1123 RestartPersistentInstance(); | 1123 RestartPersistentInstance(); |
1124 } | 1124 } |
1125 } | 1125 } |
1126 | 1126 |
1127 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1127 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |