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

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

Issue 2510803003: Pass RapporService to content/browser/ (Closed)
Patch Set: Fix more compile errors in JNI files 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_impl.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 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after
2782 std::set<std::string>* schemes) { 2783 std::set<std::string>* schemes) {
2783 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes); 2784 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes);
2784 } 2785 }
2785 2786
2786 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2787 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2787 std::vector<storage::URLRequestAutoMountHandler>* handlers) { 2788 std::vector<storage::URLRequestAutoMountHandler>* handlers) {
2788 for (size_t i = 0; i < extra_parts_.size(); ++i) 2789 for (size_t i = 0; i < extra_parts_.size(); ++i)
2789 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); 2790 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
2790 } 2791 }
2791 2792
2793 ::rappor::RapporService* ChromeContentBrowserClient::GetRapporService() {
2794 return g_browser_process->rappor_service();
2795 }
2796
2792 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2797 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2793 content::BrowserContext* browser_context, 2798 content::BrowserContext* browser_context,
2794 const base::FilePath& storage_partition_path, 2799 const base::FilePath& storage_partition_path,
2795 ScopedVector<storage::FileSystemBackend>* additional_backends) { 2800 ScopedVector<storage::FileSystemBackend>* additional_backends) {
2796 #if defined(OS_CHROMEOS) 2801 #if defined(OS_CHROMEOS)
2797 storage::ExternalMountPoints* external_mount_points = 2802 storage::ExternalMountPoints* external_mount_points =
2798 content::BrowserContext::GetMountPoints(browser_context); 2803 content::BrowserContext::GetMountPoints(browser_context);
2799 DCHECK(external_mount_points); 2804 DCHECK(external_mount_points);
2800 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( 2805 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
2801 base::MakeUnique<drive::FileSystemBackendDelegate>(), 2806 base::MakeUnique<drive::FileSystemBackendDelegate>(),
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
3314 render_frame_host, std::move(source), std::move(request)); 3319 render_frame_host, std::move(source), std::move(request));
3315 #else 3320 #else
3316 // Chrome's media remoting implementation depends on the Media Router 3321 // Chrome's media remoting implementation depends on the Media Router
3317 // infrastructure to identify remote sinks and provide the user interface for 3322 // infrastructure to identify remote sinks and provide the user interface for
3318 // sink selection. In the case where the Media Router is not present, simply 3323 // sink selection. In the case where the Media Router is not present, simply
3319 // drop the interface request. This will prevent code paths for media remoting 3324 // drop the interface request. This will prevent code paths for media remoting
3320 // in the renderer process from activating. 3325 // in the renderer process from activating.
3321 #endif 3326 #endif
3322 } 3327 }
3323 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 3328 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698