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

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

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 #if !defined(DISABLE_NACL) 152 #if !defined(DISABLE_NACL)
153 #include "chrome/browser/component_updater/pnacl_component_installer.h" 153 #include "chrome/browser/component_updater/pnacl_component_installer.h"
154 #endif 154 #endif
155 155
156 #if defined(ENABLE_PLUGIN_INSTALLATION) 156 #if defined(ENABLE_PLUGIN_INSTALLATION)
157 #include "chrome/browser/plugins/plugins_resource_service.h" 157 #include "chrome/browser/plugins/plugins_resource_service.h"
158 #endif 158 #endif
159 159
160 #if defined(ENABLE_WEBRTC) 160 #if defined(ENABLE_WEBRTC)
161 #include "chrome/browser/media/webrtc_log_uploader.h" 161 #include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
162 #endif 162 #endif
163 163
164 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 164 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
165 #include "chrome/browser/memory/tab_manager.h" 165 #include "chrome/browser/memory/tab_manager.h"
166 #endif 166 #endif
167 167
168 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 168 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
169 #include "chrome/browser/first_run/upgrade_util.h" 169 #include "chrome/browser/first_run/upgrade_util.h"
170 #endif 170 #endif
171 171
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 } 1345 }
1346 1346
1347 void BrowserProcessImpl::OnAutoupdateTimer() { 1347 void BrowserProcessImpl::OnAutoupdateTimer() {
1348 if (CanAutorestartForUpdate()) { 1348 if (CanAutorestartForUpdate()) {
1349 DLOG(WARNING) << "Detected update. Restarting browser."; 1349 DLOG(WARNING) << "Detected update. Restarting browser.";
1350 RestartBackgroundInstance(); 1350 RestartBackgroundInstance();
1351 } 1351 }
1352 } 1352 }
1353 1353
1354 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1354 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_web_contents_delegate_android.cc ('k') | chrome/browser/browsing_data/browsing_data_remover.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698