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

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 1609133002: Change Win32k PPAPI lockdown to use finch params for mime type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: code review changes Created 4 years, 10 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
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/public/browser/content_browser_client.h" 5 #include "content/public/browser/content_browser_client.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/public/browser/client_certificate_delegate.h" 9 #include "content/public/browser/client_certificate_delegate.h"
10 #include "content/public/common/sandbox_type.h" 10 #include "content/public/common/sandbox_type.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 404
405 base::string16 ContentBrowserClient::GetAppContainerSidForSandboxType( 405 base::string16 ContentBrowserClient::GetAppContainerSidForSandboxType(
406 int sandbox_type) const { 406 int sandbox_type) const {
407 // Embedders should override this method and return different SIDs for each 407 // Embedders should override this method and return different SIDs for each
408 // sandbox type. Note: All content level tests will run child processes in the 408 // sandbox type. Note: All content level tests will run child processes in the
409 // same AppContainer. 409 // same AppContainer.
410 return base::string16( 410 return base::string16(
411 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" 411 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
412 L"924012148-129201922"); 412 L"924012148-129201922");
413 } 413 }
414
415 bool ContentBrowserClient::IsWin32kLockdownEnabledForMimeType(
416 const std::string& mime_type) const {
417 // TODO(wfh): Enable this by default once Win32k lockdown for PPAPI processes
418 // is enabled by default in Chrome. See crbug.com/523278.
419 return false;
420 }
414 #endif 421 #endif
415 422
416 #if defined(VIDEO_HOLE) 423 #if defined(VIDEO_HOLE)
417 ExternalVideoSurfaceContainer* 424 ExternalVideoSurfaceContainer*
418 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 425 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
419 WebContents* web_contents) { 426 WebContents* web_contents) {
420 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; 427 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348.";
421 return nullptr; 428 return nullptr;
422 } 429 }
423 #endif 430 #endif
424 431
425 } // namespace content 432 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698