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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 2898033002: [TabManager] Move TabManager into chrome/browser/resource_coordinator. (Closed)
Patch Set: rebase Created 3 years, 6 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
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 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 #if BUILDFLAG(ENABLE_PLUGINS) 168 #if BUILDFLAG(ENABLE_PLUGINS)
169 #include "chrome/browser/plugins/plugins_resource_service.h" 169 #include "chrome/browser/plugins/plugins_resource_service.h"
170 #endif 170 #endif
171 171
172 #if BUILDFLAG(ENABLE_WEBRTC) 172 #if BUILDFLAG(ENABLE_WEBRTC)
173 #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" 173 #include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
174 #endif 174 #endif
175 175
176 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 176 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
177 #include "chrome/browser/memory/tab_manager.h" 177 #include "chrome/browser/resource_coordinator/tab_manager.h"
178 #endif 178 #endif
179 179
180 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 180 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
181 #include "chrome/browser/first_run/upgrade_util.h" 181 #include "chrome/browser/first_run/upgrade_util.h"
182 #endif 182 #endif
183 183
184 #if defined(OS_ANDROID) 184 #if defined(OS_ANDROID)
185 #include "chrome/browser/android/physical_web/physical_web_data_source_android.h " 185 #include "chrome/browser/android/physical_web/physical_web_data_source_android.h "
186 #endif 186 #endif
187 187
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 return network_time_tracker_.get(); 801 return network_time_tracker_.get();
802 } 802 }
803 803
804 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { 804 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() {
805 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 805 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
806 if (!gcm_driver_) 806 if (!gcm_driver_)
807 CreateGCMDriver(); 807 CreateGCMDriver();
808 return gcm_driver_.get(); 808 return gcm_driver_.get();
809 } 809 }
810 810
811 memory::TabManager* BrowserProcessImpl::GetTabManager() { 811 resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() {
812 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 812 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
813 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 813 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
814 if (!tab_manager_.get()) 814 if (!tab_manager_.get())
815 tab_manager_.reset(new memory::TabManager()); 815 tab_manager_.reset(new resource_coordinator::TabManager());
816 return tab_manager_.get(); 816 return tab_manager_.get();
817 #else 817 #else
818 return nullptr; 818 return nullptr;
819 #endif 819 #endif
820 } 820 }
821 821
822 shell_integration::DefaultWebClientState 822 shell_integration::DefaultWebClientState
823 BrowserProcessImpl::CachedDefaultWebClientState() { 823 BrowserProcessImpl::CachedDefaultWebClientState() {
824 return cached_default_web_client_state_; 824 return cached_default_web_client_state_;
825 } 825 }
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 } 1423 }
1424 1424
1425 void BrowserProcessImpl::OnAutoupdateTimer() { 1425 void BrowserProcessImpl::OnAutoupdateTimer() {
1426 if (CanAutorestartForUpdate()) { 1426 if (CanAutorestartForUpdate()) {
1427 DLOG(WARNING) << "Detected update. Restarting browser."; 1427 DLOG(WARNING) << "Detected update. Restarting browser.";
1428 RestartBackgroundInstance(); 1428 RestartBackgroundInstance();
1429 } 1429 }
1430 } 1430 }
1431 1431
1432 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1432 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698