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

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

Issue 2510803003: Pass RapporService to content/browser/ (Closed)
Patch Set: Fix an Android compile error Created 4 years 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 #include "components/error_page/common/error_page_switches.h" 129 #include "components/error_page/common/error_page_switches.h"
130 #include "components/google/core/browser/google_util.h" 130 #include "components/google/core/browser/google_util.h"
131 #include "components/metrics/call_stack_profile_collector.h" 131 #include "components/metrics/call_stack_profile_collector.h"
132 #include "components/metrics/client_info.h" 132 #include "components/metrics/client_info.h"
133 #include "components/net_log/chrome_net_log.h" 133 #include "components/net_log/chrome_net_log.h"
134 #include "components/password_manager/content/browser/content_password_manager_d river_factory.h" 134 #include "components/password_manager/content/browser/content_password_manager_d river_factory.h"
135 #include "components/payments/payment_request.mojom.h" 135 #include "components/payments/payment_request.mojom.h"
136 #include "components/pref_registry/pref_registry_syncable.h" 136 #include "components/pref_registry/pref_registry_syncable.h"
137 #include "components/prefs/pref_service.h" 137 #include "components/prefs/pref_service.h"
138 #include "components/prefs/scoped_user_pref_update.h" 138 #include "components/prefs/scoped_user_pref_update.h"
139 #include "components/rappor/public/rappor_utils.h"
139 #include "components/rappor/rappor_recorder_impl.h" 140 #include "components/rappor/rappor_recorder_impl.h"
140 #include "components/rappor/rappor_utils.h" 141 #include "components/rappor/rappor_service.h"
141 #include "components/security_interstitials/core/ssl_error_ui.h" 142 #include "components/security_interstitials/core/ssl_error_ui.h"
142 #include "components/signin/core/common/profile_management_switches.h" 143 #include "components/signin/core/common/profile_management_switches.h"
143 #include "components/spellcheck/spellcheck_build_features.h" 144 #include "components/spellcheck/spellcheck_build_features.h"
144 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" 145 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h"
145 #include "components/translate/core/common/translate_switches.h" 146 #include "components/translate/core/common/translate_switches.h"
146 #include "components/url_formatter/url_fixer.h" 147 #include "components/url_formatter/url_fixer.h"
147 #include "components/variations/variations_associated_data.h" 148 #include "components/variations/variations_associated_data.h"
148 #include "components/version_info/version_info.h" 149 #include "components/version_info/version_info.h"
149 #include "content/public/browser/browser_child_process_host.h" 150 #include "content/public/browser/browser_child_process_host.h"
150 #include "content/public/browser/browser_main_parts.h" 151 #include "content/public/browser/browser_main_parts.h"
(...skipping 2629 matching lines...) Expand 10 before | Expand all | Expand 10 after
2780 std::set<std::string>* schemes) { 2781 std::set<std::string>* schemes) {
2781 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes); 2782 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes);
2782 } 2783 }
2783 2784
2784 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2785 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2785 std::vector<storage::URLRequestAutoMountHandler>* handlers) { 2786 std::vector<storage::URLRequestAutoMountHandler>* handlers) {
2786 for (size_t i = 0; i < extra_parts_.size(); ++i) 2787 for (size_t i = 0; i < extra_parts_.size(); ++i)
2787 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); 2788 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
2788 } 2789 }
2789 2790
2791 ::rappor::RapporPublicService* ChromeContentBrowserClient::GetRapporService() {
2792 return g_browser_process->rappor_service();
2793 }
2794
2790 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2795 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2791 content::BrowserContext* browser_context, 2796 content::BrowserContext* browser_context,
2792 const base::FilePath& storage_partition_path, 2797 const base::FilePath& storage_partition_path,
2793 ScopedVector<storage::FileSystemBackend>* additional_backends) { 2798 ScopedVector<storage::FileSystemBackend>* additional_backends) {
2794 #if defined(OS_CHROMEOS) 2799 #if defined(OS_CHROMEOS)
2795 storage::ExternalMountPoints* external_mount_points = 2800 storage::ExternalMountPoints* external_mount_points =
2796 content::BrowserContext::GetMountPoints(browser_context); 2801 content::BrowserContext::GetMountPoints(browser_context);
2797 DCHECK(external_mount_points); 2802 DCHECK(external_mount_points);
2798 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( 2803 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
2799 base::MakeUnique<drive::FileSystemBackendDelegate>(), 2804 base::MakeUnique<drive::FileSystemBackendDelegate>(),
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
3299 render_frame_host, std::move(source), std::move(request)); 3304 render_frame_host, std::move(source), std::move(request));
3300 #else 3305 #else
3301 // Chrome's media remoting implementation depends on the Media Router 3306 // Chrome's media remoting implementation depends on the Media Router
3302 // infrastructure to identify remote sinks and provide the user interface for 3307 // infrastructure to identify remote sinks and provide the user interface for
3303 // sink selection. In the case where the Media Router is not present, simply 3308 // sink selection. In the case where the Media Router is not present, simply
3304 // drop the interface request. This will prevent code paths for media remoting 3309 // drop the interface request. This will prevent code paths for media remoting
3305 // in the renderer process from activating. 3310 // in the renderer process from activating.
3306 #endif 3311 #endif
3307 } 3312 }
3308 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 3313 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698