OLD | NEW |
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 91 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
92 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 92 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
93 #include "chrome/browser/ui/browser_navigator.h" | 93 #include "chrome/browser/ui/browser_navigator.h" |
94 #include "chrome/browser/ui/browser_navigator_params.h" | 94 #include "chrome/browser/ui/browser_navigator_params.h" |
95 #include "chrome/browser/ui/chrome_select_file_policy.h" | 95 #include "chrome/browser/ui/chrome_select_file_policy.h" |
96 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 96 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
97 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 97 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
98 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 98 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
99 #include "chrome/browser/ui/webui/log_web_ui_url.h" | 99 #include "chrome/browser/ui/webui/log_web_ui_url.h" |
100 #include "chrome/browser/usb/usb_tab_helper.h" | 100 #include "chrome/browser/usb/usb_tab_helper.h" |
| 101 #include "chrome/browser/webshare/share_service_impl.h" |
101 #include "chrome/common/channel_info.h" | 102 #include "chrome/common/channel_info.h" |
102 #include "chrome/common/chrome_constants.h" | 103 #include "chrome/common/chrome_constants.h" |
103 #include "chrome/common/chrome_paths.h" | 104 #include "chrome/common/chrome_paths.h" |
104 #include "chrome/common/chrome_switches.h" | 105 #include "chrome/common/chrome_switches.h" |
105 #include "chrome/common/env_vars.h" | 106 #include "chrome/common/env_vars.h" |
106 #include "chrome/common/features.h" | 107 #include "chrome/common/features.h" |
107 #include "chrome/common/logging_chrome.h" | 108 #include "chrome/common/logging_chrome.h" |
108 #include "chrome/common/origin_trials/chrome_origin_trial_policy.h" | 109 #include "chrome/common/origin_trials/chrome_origin_trial_policy.h" |
109 #include "chrome/common/pepper_permission_util.h" | 110 #include "chrome/common/pepper_permission_util.h" |
110 #include "chrome/common/pref_names.h" | 111 #include "chrome/common/pref_names.h" |
(...skipping 2939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3050 content::WebContents* web_contents = | 3051 content::WebContents* web_contents = |
3051 content::WebContents::FromRenderFrameHost(render_frame_host); | 3052 content::WebContents::FromRenderFrameHost(render_frame_host); |
3052 if (web_contents) { | 3053 if (web_contents) { |
3053 registry->AddInterface( | 3054 registry->AddInterface( |
3054 web_contents->GetJavaInterfaces() | 3055 web_contents->GetJavaInterfaces() |
3055 ->CreateInterfaceFactory<blink::mojom::BarcodeDetection>()); | 3056 ->CreateInterfaceFactory<blink::mojom::BarcodeDetection>()); |
3056 } | 3057 } |
3057 } | 3058 } |
3058 #endif | 3059 #endif |
3059 | 3060 |
| 3061 #if defined(OS_LINUX) || defined(OS_WIN) |
| 3062 if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) { |
| 3063 registry->AddInterface(base::Bind(&ShareServiceImpl::Create)); |
| 3064 } |
| 3065 #endif |
3060 } | 3066 } |
3061 | 3067 |
3062 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( | 3068 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( |
3063 service_manager::InterfaceRegistry* registry, | 3069 service_manager::InterfaceRegistry* registry, |
3064 content::GpuProcessHost* render_process_host) { | 3070 content::GpuProcessHost* render_process_host) { |
3065 registry->AddInterface( | 3071 registry->AddInterface( |
3066 base::Bind(&metrics::CallStackProfileCollector::Create, | 3072 base::Bind(&metrics::CallStackProfileCollector::Create, |
3067 metrics::CallStackProfileParams::GPU_PROCESS)); | 3073 metrics::CallStackProfileParams::GPU_PROCESS)); |
3068 } | 3074 } |
3069 | 3075 |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3349 GetBrowserSchedulerWorkerPoolParamsFromVariations(); | 3355 GetBrowserSchedulerWorkerPoolParamsFromVariations(); |
3350 *index_to_traits_callback = base::Bind(&task_scheduler_util::initialization:: | 3356 *index_to_traits_callback = base::Bind(&task_scheduler_util::initialization:: |
3351 BrowserWorkerPoolIndexForTraits); | 3357 BrowserWorkerPoolIndexForTraits); |
3352 } | 3358 } |
3353 | 3359 |
3354 void ChromeContentBrowserClient:: | 3360 void ChromeContentBrowserClient:: |
3355 PerformExperimentalTaskSchedulerRedirections() { | 3361 PerformExperimentalTaskSchedulerRedirections() { |
3356 task_scheduler_util::variations:: | 3362 task_scheduler_util::variations:: |
3357 MaybePerformBrowserTaskSchedulerRedirection(); | 3363 MaybePerformBrowserTaskSchedulerRedirection(); |
3358 } | 3364 } |
OLD | NEW |