OLD | NEW |
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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 content::MediaObserver* GetMediaObserver() override; | 182 content::MediaObserver* GetMediaObserver() override; |
183 content::PlatformNotificationService* GetPlatformNotificationService() | 183 content::PlatformNotificationService* GetPlatformNotificationService() |
184 override; | 184 override; |
185 void RequestPermission( | 185 void RequestPermission( |
186 content::PermissionType permission, | 186 content::PermissionType permission, |
187 content::WebContents* web_contents, | 187 content::WebContents* web_contents, |
188 int bridge_id, | 188 int bridge_id, |
189 const GURL& requesting_frame, | 189 const GURL& requesting_frame, |
190 bool user_gesture, | 190 bool user_gesture, |
191 const base::Callback<void(bool)>& result_callback) override; | 191 const base::Callback<void(bool)>& result_callback) override; |
| 192 content::PermissionStatus GetPermissionStatus( |
| 193 content::PermissionType permission, |
| 194 content::BrowserContext* browser_context, |
| 195 const GURL& requesting_origin, |
| 196 const GURL& embedding_origin) override; |
192 void CancelPermissionRequest(content::PermissionType permission, | 197 void CancelPermissionRequest(content::PermissionType permission, |
193 content::WebContents* web_contents, | 198 content::WebContents* web_contents, |
194 int bridge_id, | 199 int bridge_id, |
195 const GURL& requesting_frame) override; | 200 const GURL& requesting_frame) override; |
196 void RegisterPermissionUsage(content::PermissionType permission, | 201 void RegisterPermissionUsage(content::PermissionType permission, |
197 content::WebContents* web_contents, | 202 content::WebContents* web_contents, |
198 const GURL& frame_url, | 203 const GURL& frame_url, |
199 const GURL& main_frame_url) override; | 204 const GURL& main_frame_url) override; |
200 bool CanCreateWindow(const GURL& opener_url, | 205 bool CanCreateWindow(const GURL& opener_url, |
201 const GURL& opener_top_level_frame_url, | 206 const GURL& opener_top_level_frame_url, |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 328 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
324 | 329 |
325 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 330 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
326 | 331 |
327 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 332 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
328 }; | 333 }; |
329 | 334 |
330 } // namespace chrome | 335 } // namespace chrome |
331 | 336 |
332 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 337 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |