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

Unified Diff: chrome/browser/extensions/api/page_capture/page_capture_api.cc

Issue 2697833004: Revert of Public Sessions - prompt the user for pageCapture requests (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/page_capture/page_capture_api.cc
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.cc b/chrome/browser/extensions/api/page_capture/page_capture_api.cc
index 5a26fd80a61788150a7dda9c4c4fa4c28788881f..c6f19a7d7dacb5fa88eadd53eadd5471f173715e 100644
--- a/chrome/browser/extensions/api/page_capture/page_capture_api.cc
+++ b/chrome/browser/extensions/api/page_capture/page_capture_api.cc
@@ -8,13 +8,10 @@
#include <memory>
#include "base/bind.h"
-#include "base/bind_helpers.h"
#include "base/files/file_util.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profiles_state.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
@@ -25,10 +22,6 @@
#include "content/public/common/mhtml_generation_params.h"
#include "extensions/common/extension_messages.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/extensions/public_session_permission_helper.h"
-#endif
-
using content::BrowserThread;
using content::ChildProcessSecurityPolicy;
using content::WebContents;
@@ -43,9 +36,6 @@
const char kMHTMLGenerationFailedError[] = "Failed to generate MHTML.";
const char kTemporaryFileError[] = "Failed to create a temporary file.";
const char kTabClosedError[] = "Cannot find the tab for this request.";
-#if defined(OS_CHROMEOS)
-const char kUserDenied[] = "User denied request.";
-#endif
void ClearFileReferenceOnIOThread(
scoped_refptr<storage::ShareableFileReference>) {}
@@ -75,31 +65,6 @@
AddRef(); // Balanced in ReturnFailure/ReturnSuccess()
- // In Public Sessions, extensions (and apps) are force-installed by admin
- // policy so the user does not get a chance to review the permissions for
- // these extensions. This is not acceptable from a security/privacy
- // standpoint, so when an extension uses the PageCapture API for the first
- // time, we show the user a dialog where they can choose whether to allow the
- // extension access to the API.
-#if defined(OS_CHROMEOS)
- if (profiles::IsPublicSession()) {
- WebContents* web_contents = GetWebContents();
- if (!web_contents) {
- ReturnFailure(kTabClosedError);
- return true;
- }
- // This Unretained is safe because this object is Released() in
- // OnMessageReceived which gets called at some point after callback is run.
- auto callback =
- base::Bind(&PageCaptureSaveAsMHTMLFunction::ResolvePermissionRequest,
- base::Unretained(this));
- permission_helper::HandlePermissionRequest(
- *extension(), {APIPermission::kPageCapture}, web_contents, callback,
- permission_helper::PromptFactory());
- return true;
- }
-#endif
-
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile, this));
@@ -127,19 +92,6 @@
return true;
}
-
-#if defined(OS_CHROMEOS)
-void PageCaptureSaveAsMHTMLFunction::ResolvePermissionRequest(
- const PermissionIDSet& allowed_permissions) {
- if (allowed_permissions.ContainsID(APIPermission::kPageCapture)) {
- BrowserThread::PostTask(
- BrowserThread::FILE, FROM_HERE,
- base::Bind(&PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile, this));
- } else {
- ReturnFailure(kUserDenied);
- }
-}
-#endif
void PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile() {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);

Powered by Google App Engine
This is Rietveld 408576698