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

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

Issue 2706403014: Add Android implementation of navigator.getInstalledRelatedApps. (Closed)
Patch Set: Fixed iframes (now has the correct origin of the frame, not the tab). Created 3 years, 9 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/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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 #include "net/ssl/ssl_cert_request_info.h" 195 #include "net/ssl/ssl_cert_request_info.h"
196 #include "ppapi/features/features.h" 196 #include "ppapi/features/features.h"
197 #include "ppapi/host/ppapi_host.h" 197 #include "ppapi/host/ppapi_host.h"
198 #include "printing/features/features.h" 198 #include "printing/features/features.h"
199 #include "services/image_decoder/public/interfaces/constants.mojom.h" 199 #include "services/image_decoder/public/interfaces/constants.mojom.h"
200 #include "services/preferences/public/interfaces/preferences.mojom.h" 200 #include "services/preferences/public/interfaces/preferences.mojom.h"
201 #include "services/service_manager/public/cpp/interface_provider.h" 201 #include "services/service_manager/public/cpp/interface_provider.h"
202 #include "services/service_manager/public/cpp/interface_registry.h" 202 #include "services/service_manager/public/cpp/interface_registry.h"
203 #include "services/service_manager/public/cpp/service.h" 203 #include "services/service_manager/public/cpp/service.h"
204 #include "storage/browser/fileapi/external_mount_points.h" 204 #include "storage/browser/fileapi/external_mount_points.h"
205 #include "third_party/WebKit/public/platform/modules/installedapp/installed_app_ provider.mojom.h"
205 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" 206 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
206 #include "ui/base/l10n/l10n_util.h" 207 #include "ui/base/l10n/l10n_util.h"
207 #include "ui/base/resource/resource_bundle.h" 208 #include "ui/base/resource/resource_bundle.h"
208 #include "ui/resources/grit/ui_resources.h" 209 #include "ui/resources/grit/ui_resources.h"
209 #include "url/gurl.h" 210 #include "url/gurl.h"
210 #include "url/origin.h" 211 #include "url/origin.h"
211 212
212 #if defined(OS_WIN) 213 #if defined(OS_WIN)
213 #include "base/strings/string_tokenizer.h" 214 #include "base/strings/string_tokenizer.h"
214 #include "chrome/browser/chrome_browser_main_win.h" 215 #include "chrome/browser/chrome_browser_main_win.h"
(...skipping 2955 matching lines...) Expand 10 before | Expand all | Expand 10 after
3170 3171
3171 registry->AddInterface( 3172 registry->AddInterface(
3172 base::Bind(&password_manager::ContentPasswordManagerDriverFactory:: 3173 base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
3173 BindSensitiveInputVisibilityService, 3174 BindSensitiveInputVisibilityService,
3174 render_frame_host)); 3175 render_frame_host));
3175 3176
3176 #if defined(OS_ANDROID) 3177 #if defined(OS_ANDROID)
3177 registry->AddInterface( 3178 registry->AddInterface(
3178 render_frame_host->GetJavaInterfaces() 3179 render_frame_host->GetJavaInterfaces()
3179 ->CreateInterfaceFactory<payments::mojom::PaymentRequest>()); 3180 ->CreateInterfaceFactory<payments::mojom::PaymentRequest>());
3181 registry->AddInterface(
3182 render_frame_host->GetJavaInterfaces()
3183 ->CreateInterfaceFactory<blink::mojom::InstalledAppProvider>());
3180 content::WebContents* web_contents = 3184 content::WebContents* web_contents =
3181 content::WebContents::FromRenderFrameHost(render_frame_host); 3185 content::WebContents::FromRenderFrameHost(render_frame_host);
3182 if (web_contents) { 3186 if (web_contents) {
3183 registry->AddInterface( 3187 registry->AddInterface(
3184 base::Bind(&ForwardShareServiceRequest, 3188 base::Bind(&ForwardShareServiceRequest,
3185 web_contents->GetJavaInterfaces()->GetWeakPtr())); 3189 web_contents->GetJavaInterfaces()->GetWeakPtr()));
3186 } 3190 }
3187 #else 3191 #else
3188 if (AreExperimentalWebPlatformFeaturesEnabled() && 3192 if (AreExperimentalWebPlatformFeaturesEnabled() &&
3189 base::FeatureList::IsEnabled(features::kWebPayments)) { 3193 base::FeatureList::IsEnabled(features::kWebPayments)) {
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
3561 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3565 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3562 return variations::GetVariationParamValue( 3566 return variations::GetVariationParamValue(
3563 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3567 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3564 } 3568 }
3565 3569
3566 // static 3570 // static
3567 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3571 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3568 const storage::QuotaSettings* settings) { 3572 const storage::QuotaSettings* settings) {
3569 g_default_quota_settings = settings; 3573 g_default_quota_settings = settings;
3570 } 3574 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698