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

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

Issue 14329020: Implementing uploading of a WebRTC diagnostic log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed file added by mistake. Created 7 years, 7 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/chrome_manifest_handlers.h" 73 #include "chrome/common/extensions/chrome_manifest_handlers.h"
74 #include "chrome/common/extensions/extension_l10n_util.h" 74 #include "chrome/common/extensions/extension_l10n_util.h"
75 #include "chrome/common/extensions/permissions/chrome_api_permissions.h" 75 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
76 #include "chrome/common/extensions/permissions/permissions_info.h" 76 #include "chrome/common/extensions/permissions/permissions_info.h"
77 #include "chrome/common/pref_names.h" 77 #include "chrome/common/pref_names.h"
78 #include "chrome/common/switch_utils.h" 78 #include "chrome/common/switch_utils.h"
79 #include "chrome/common/url_constants.h" 79 #include "chrome/common/url_constants.h"
80 #include "chrome/installer/util/google_update_constants.h" 80 #include "chrome/installer/util/google_update_constants.h"
81 #include "components/webrtc_log_uploader/webrtc_log_uploader.h"
81 #include "content/public/browser/browser_thread.h" 82 #include "content/public/browser/browser_thread.h"
82 #include "content/public/browser/child_process_security_policy.h" 83 #include "content/public/browser/child_process_security_policy.h"
83 #include "content/public/browser/notification_details.h" 84 #include "content/public/browser/notification_details.h"
84 #include "content/public/browser/plugin_service.h" 85 #include "content/public/browser/plugin_service.h"
85 #include "content/public/browser/render_process_host.h" 86 #include "content/public/browser/render_process_host.h"
86 #include "content/public/browser/resource_dispatcher_host.h" 87 #include "content/public/browser/resource_dispatcher_host.h"
87 #include "extensions/common/constants.h" 88 #include "extensions/common/constants.h"
88 #include "net/socket/client_socket_pool_manager.h" 89 #include "net/socket/client_socket_pool_manager.h"
89 #include "net/url_request/url_request_context_getter.h" 90 #include "net/url_request/url_request_context_getter.h"
90 #include "ui/base/l10n/l10n_util.h" 91 #include "ui/base/l10n/l10n_util.h"
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 #if !defined(OS_WIN) 638 #if !defined(OS_WIN)
638 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing( 639 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing(
639 const CommandLine& command_line) { 640 const CommandLine& command_line) {
640 } 641 }
641 #endif 642 #endif
642 643
643 bool BrowserProcessImpl::created_local_state() const { 644 bool BrowserProcessImpl::created_local_state() const {
644 return created_local_state_; 645 return created_local_state_;
645 } 646 }
646 647
648 components::WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() {
649 #if defined(ENABLE_WEBRTC)
650 return webrtc_log_uploader_.get();
651 #else
652 return NULL;
653 #endif
654 }
655
647 // static 656 // static
648 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { 657 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
649 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 658 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
650 false); 659 false);
651 // This policy needs to be defined before the net subsystem is initialized, 660 // This policy needs to be defined before the net subsystem is initialized,
652 // so we do it here. 661 // so we do it here.
653 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, 662 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy,
654 net::kDefaultMaxSocketsPerProxyServer); 663 net::kDefaultMaxSocketsPerProxyServer);
655 664
656 // This is observed by ChildProcessSecurityPolicy, which lives in content/ 665 // This is observed by ChildProcessSecurityPolicy, which lives in content/
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 #if !defined(OS_ANDROID) 919 #if !defined(OS_ANDROID)
911 if (browser_defaults::bookmarks_enabled && 920 if (browser_defaults::bookmarks_enabled &&
912 BookmarkPromptController::IsEnabled()) { 921 BookmarkPromptController::IsEnabled()) {
913 bookmark_prompt_controller_.reset(new BookmarkPromptController()); 922 bookmark_prompt_controller_.reset(new BookmarkPromptController());
914 } 923 }
915 #endif 924 #endif
916 925
917 #if defined(OS_MACOSX) 926 #if defined(OS_MACOSX)
918 app_shim_host_manager_.reset(new AppShimHostManager); 927 app_shim_host_manager_.reset(new AppShimHostManager);
919 #endif 928 #endif
929
930 #if defined(ENABLE_WEBRTC)
931 webrtc_log_uploader_.reset(new components::WebRtcLogUploader());
932 #endif
920 } 933 }
921 934
922 void BrowserProcessImpl::CreateIconManager() { 935 void BrowserProcessImpl::CreateIconManager() {
923 DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL); 936 DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL);
924 created_icon_manager_ = true; 937 created_icon_manager_ = true;
925 icon_manager_.reset(new IconManager); 938 icon_manager_.reset(new IconManager);
926 } 939 }
927 940
928 void BrowserProcessImpl::CreateIntranetRedirectDetector() { 941 void BrowserProcessImpl::CreateIntranetRedirectDetector() {
929 DCHECK(intranet_redirect_detector_.get() == NULL); 942 DCHECK(intranet_redirect_detector_.get() == NULL);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 } 1071 }
1059 1072
1060 void BrowserProcessImpl::OnAutoupdateTimer() { 1073 void BrowserProcessImpl::OnAutoupdateTimer() {
1061 if (CanAutorestartForUpdate()) { 1074 if (CanAutorestartForUpdate()) {
1062 DLOG(WARNING) << "Detected update. Restarting browser."; 1075 DLOG(WARNING) << "Detected update. Restarting browser.";
1063 RestartBackgroundInstance(); 1076 RestartBackgroundInstance();
1064 } 1077 }
1065 } 1078 }
1066 1079
1067 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1080 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698