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

Unified Diff: third_party/WebKit/Source/web/LocalFileSystemClient.cpp

Issue 2786673002: Separate ContentSettingsClient out from LocalFrameClient (Closed)
Patch Set: added class-level comment Created 3 years, 8 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: third_party/WebKit/Source/web/LocalFileSystemClient.cpp
diff --git a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
index 30dced4a000aeba15bde9206ebb89490ead2b3e8..2ca9f49eaa72a42521171e014f76867d013ddee2 100644
--- a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
+++ b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
@@ -30,17 +30,16 @@
#include "web/LocalFileSystemClient.h"
+#include <memory>
#include "core/dom/Document.h"
+#include "core/frame/ContentSettingsClient.h"
#include "core/workers/WorkerGlobalScope.h"
#include "platform/ContentSettingCallbacks.h"
#include "platform/weborigin/SecurityOrigin.h"
-#include "public/platform/WebContentSettingCallbacks.h"
-#include "public/web/WebContentSettingsClient.h"
#include "web/WebLocalFrameImpl.h"
#include "web/WorkerContentSettingsClient.h"
#include "wtf/PtrUtil.h"
#include "wtf/text/WTFString.h"
-#include <memory>
namespace blink {
@@ -74,12 +73,8 @@ void LocalFileSystemClient::requestFileSystemAccessAsync(
}
Document* document = toDocument(context);
- WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame());
- if (!webFrame->contentSettingsClient()) {
- callbacks->onAllowed();
- return;
- }
- webFrame->contentSettingsClient()->requestFileSystemAccessAsync(
+ DCHECK(document->frame());
+ document->frame()->contentSettingsClient()->requestFileSystemAccessAsync(
std::move(callbacks));
}
« no previous file with comments | « third_party/WebKit/Source/web/IndexedDBClientImpl.cpp ('k') | third_party/WebKit/Source/web/LocalFrameClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698