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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 1985093002: ppapi: PPB_VpnProvider: Implement permission check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 4 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
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 "android_webview/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 474
475 bool AwContentBrowserClient::AllowPepperSocketAPI( 475 bool AwContentBrowserClient::AllowPepperSocketAPI(
476 content::BrowserContext* browser_context, 476 content::BrowserContext* browser_context,
477 const GURL& url, 477 const GURL& url,
478 bool private_api, 478 bool private_api,
479 const content::SocketPermissionRequest* params) { 479 const content::SocketPermissionRequest* params) {
480 NOTREACHED() << "Android WebView does not support plugins"; 480 NOTREACHED() << "Android WebView does not support plugins";
481 return false; 481 return false;
482 } 482 }
483 483
484 bool AwContentBrowserClient::IsPepperVpnProviderAPIAllowed(
485 content::BrowserContext* browser_context,
486 const GURL& url) {
487 NOTREACHED() << "Android WebView does not support plugins";
488 return false;
489 }
490
484 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 491 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
485 const base::CommandLine& command_line, 492 const base::CommandLine& command_line,
486 int child_process_id, 493 int child_process_id,
487 content::FileDescriptorInfo* mappings, 494 content::FileDescriptorInfo* mappings,
488 std::map<int, base::MemoryMappedFile::Region>* regions) { 495 std::map<int, base::MemoryMappedFile::Region>* regions) {
489 int fd = ui::GetMainAndroidPackFd( 496 int fd = ui::GetMainAndroidPackFd(
490 &(*regions)[kAndroidWebViewMainPakDescriptor]); 497 &(*regions)[kAndroidWebViewMainPakDescriptor]);
491 mappings->Share(kAndroidWebViewMainPakDescriptor, fd); 498 mappings->Share(kAndroidWebViewMainPakDescriptor, fd);
492 499
493 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]); 500 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 537
531 #if defined(VIDEO_HOLE) 538 #if defined(VIDEO_HOLE)
532 content::ExternalVideoSurfaceContainer* 539 content::ExternalVideoSurfaceContainer*
533 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 540 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
534 content::WebContents* web_contents) { 541 content::WebContents* web_contents) {
535 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 542 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
536 } 543 }
537 #endif 544 #endif
538 545
539 } // namespace android_webview 546 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698