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

Side by Side Diff: android_webview/browser/aw_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 ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include "android_webview/browser/aw_web_preferences_populater.h" 8 #include "android_webview/browser/aw_web_preferences_populater.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 int render_process_id, 105 int render_process_id,
106 int render_frame_id, 106 int render_frame_id,
107 net::SSLCertRequestInfo* cert_request_info, 107 net::SSLCertRequestInfo* cert_request_info,
108 const base::Callback<void(net::X509Certificate*)>& callback) override; 108 const base::Callback<void(net::X509Certificate*)>& callback) override;
109 void RequestPermission( 109 void RequestPermission(
110 content::PermissionType permission, 110 content::PermissionType permission,
111 content::WebContents* web_contents, 111 content::WebContents* web_contents,
112 int bridge_id, 112 int bridge_id,
113 const GURL& requesting_frame, 113 const GURL& requesting_frame,
114 bool user_gesture, 114 bool user_gesture,
115 const base::Callback<void(bool)>& result_callback) override; 115 const base::Callback<void(content::PermissionStatus)>& callback) override;
116 void CancelPermissionRequest(content::PermissionType permission, 116 void CancelPermissionRequest(content::PermissionType permission,
117 content::WebContents* web_contents, 117 content::WebContents* web_contents,
118 int bridge_id, 118 int bridge_id,
119 const GURL& origin) override; 119 const GURL& origin) override;
120 bool CanCreateWindow(const GURL& opener_url, 120 bool CanCreateWindow(const GURL& opener_url,
121 const GURL& opener_top_level_frame_url, 121 const GURL& opener_top_level_frame_url,
122 const GURL& source_origin, 122 const GURL& source_origin,
123 WindowContainerType container_type, 123 WindowContainerType container_type,
124 const GURL& target_url, 124 const GURL& target_url,
125 const content::Referrer& referrer, 125 const content::Referrer& referrer,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; 161 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_;
162 162
163 JniDependencyFactory* native_factory_; 163 JniDependencyFactory* native_factory_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 165 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
166 }; 166 };
167 167
168 } // namespace android_webview 168 } // namespace android_webview
169 169
170 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 170 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698