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

Side by Side Diff: content/shell/browser/layout_test/layout_test_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 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 CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include "content/public/browser/permission_type.h" 8 #include "content/public/browser/permission_type.h"
9 #include "content/shell/browser/shell_content_browser_client.h" 9 #include "content/shell/browser/shell_content_browser_client.h"
10 10
(...skipping 16 matching lines...) Expand all
27 LayoutTestNotificationManager* GetLayoutTestNotificationManager(); 27 LayoutTestNotificationManager* GetLayoutTestNotificationManager();
28 28
29 // ContentBrowserClient overrides. 29 // ContentBrowserClient overrides.
30 void RenderProcessWillLaunch(RenderProcessHost* host) override; 30 void RenderProcessWillLaunch(RenderProcessHost* host) override;
31 void RequestPermission( 31 void RequestPermission(
32 PermissionType permission, 32 PermissionType permission,
33 WebContents* web_contents, 33 WebContents* web_contents,
34 int bridge_id, 34 int bridge_id,
35 const GURL& requesting_frame, 35 const GURL& requesting_frame,
36 bool user_gesture, 36 bool user_gesture,
37 const base::Callback<void(bool)>& result_callback) override; 37 const base::Callback<void(PermissionStatus)>& callback) override;
38 PlatformNotificationService* GetPlatformNotificationService() override; 38 PlatformNotificationService* GetPlatformNotificationService() override;
39 39
40 private: 40 private:
41 scoped_ptr<LayoutTestNotificationManager> layout_test_notification_manager_; 41 scoped_ptr<LayoutTestNotificationManager> layout_test_notification_manager_;
42 }; 42 };
43 43
44 } // content 44 } // content
45 45
46 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_ H_ 46 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698