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

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

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android geolocation breakage Created 5 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 (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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 // Notifications to the user. The embedder can return a nullptr if they don't 427 // Notifications to the user. The embedder can return a nullptr if they don't
428 // support this functionality. May be called from any thread. 428 // support this functionality. May be called from any thread.
429 virtual PlatformNotificationService* GetPlatformNotificationService(); 429 virtual PlatformNotificationService* GetPlatformNotificationService();
430 430
431 virtual void RequestPermission( 431 virtual void RequestPermission(
432 PermissionType permission, 432 PermissionType permission,
433 WebContents* web_contents, 433 WebContents* web_contents,
434 int bridge_id, 434 int bridge_id,
435 const GURL& requesting_frame, 435 const GURL& requesting_frame,
436 bool user_gesture, 436 bool user_gesture,
437 const base::Callback<void(bool)>& result_callback); 437 const base::Callback<void(PermissionStatus)>& callback);
438 438
439 virtual void CancelPermissionRequest(PermissionType permission, 439 virtual void CancelPermissionRequest(PermissionType permission,
440 WebContents* web_contents, 440 WebContents* web_contents,
441 int bridge_id, 441 int bridge_id,
442 const GURL& requesting_frame) {} 442 const GURL& requesting_frame) {}
443 443
444 virtual void RegisterPermissionUsage(PermissionType permission, 444 virtual void RegisterPermissionUsage(PermissionType permission,
445 WebContents* web_contents, 445 WebContents* web_contents,
446 const GURL& frame_url, 446 const GURL& frame_url,
447 const GURL& main_frame_url) {} 447 const GURL& main_frame_url) {}
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 653 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
654 // implementation. Return nullptr to disable external surface video. 654 // implementation. Return nullptr to disable external surface video.
655 virtual ExternalVideoSurfaceContainer* 655 virtual ExternalVideoSurfaceContainer*
656 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 656 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
657 #endif 657 #endif
658 }; 658 };
659 659
660 } // namespace content 660 } // namespace content
661 661
662 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 662 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698