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

Side by Side Diff: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_DEL EGATE_H_ 5 #ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_DEL EGATE_H_
6 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_DEL EGATE_H_ 6 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_DEL EGATE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/common/features.h" 9 #include "chrome/common/features.h"
10 #include "components/content_settings/core/common/content_settings.h"
10 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" 11 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
11 #include "extensions/browser/guest_view/web_view/web_view_permission_helper_dele gate.h" 12 #include "extensions/browser/guest_view/web_view/web_view_permission_helper_dele gate.h"
12 #include "ppapi/features/features.h" 13 #include "ppapi/features/features.h"
13 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h" 14 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h"
14 15
15 namespace extensions { 16 namespace extensions {
16 class WebViewGuest; 17 class WebViewGuest;
17 18
18 class ChromeWebViewPermissionHelperDelegate : 19 class ChromeWebViewPermissionHelperDelegate :
19 public WebViewPermissionHelperDelegate { 20 public WebViewPermissionHelperDelegate {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #endif // BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) 73 #endif // BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
73 74
74 void OnPermissionResponse(const std::string& identifier, 75 void OnPermissionResponse(const std::string& identifier,
75 bool allow, 76 bool allow,
76 const std::string& user_input); 77 const std::string& user_input);
77 #endif // BUILDFLAG(ENABLE_PLUGINS) 78 #endif // BUILDFLAG(ENABLE_PLUGINS)
78 79
79 void OnGeolocationPermissionResponse( 80 void OnGeolocationPermissionResponse(
80 int bridge_id, 81 int bridge_id,
81 bool user_gesture, 82 bool user_gesture,
82 const base::Callback<void(blink::mojom::PermissionStatus)>& callback, 83 const base::Callback<void(ContentSetting)>& callback,
83 bool allow, 84 bool allow,
84 const std::string& user_input); 85 const std::string& user_input);
85 86
86 void OnFileSystemPermissionResponse( 87 void OnFileSystemPermissionResponse(
87 const base::Callback<void(bool)>& callback, 88 const base::Callback<void(bool)>& callback,
88 bool allow, 89 bool allow,
89 const std::string& user_input); 90 const std::string& user_input);
90 91
91 void OnDownloadPermissionResponse( 92 void OnDownloadPermissionResponse(
92 const base::Callback<void(bool)>& callback, 93 const base::Callback<void(bool)>& callback,
(...skipping 29 matching lines...) Expand all
122 std::map<int, int> bridge_id_to_request_id_map_; 123 std::map<int, int> bridge_id_to_request_id_map_;
123 124
124 base::WeakPtrFactory<ChromeWebViewPermissionHelperDelegate> weak_factory_; 125 base::WeakPtrFactory<ChromeWebViewPermissionHelperDelegate> weak_factory_;
125 126
126 DISALLOW_COPY_AND_ASSIGN(ChromeWebViewPermissionHelperDelegate); 127 DISALLOW_COPY_AND_ASSIGN(ChromeWebViewPermissionHelperDelegate);
127 }; 128 };
128 129
129 } // namespace extensions 130 } // namespace extensions
130 131
131 #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_ DELEGATE_H_ 132 #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_ DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698