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

Side by Side Diff: chrome/browser/chrome_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 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 int render_frame_id) override; 181 int render_frame_id) override;
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(content::PermissionStatus)>& callback) override;
192 content::PermissionStatus GetPermissionStatus( 192 content::PermissionStatus GetPermissionStatus(
193 content::PermissionType permission, 193 content::PermissionType permission,
194 content::BrowserContext* browser_context, 194 content::BrowserContext* browser_context,
195 const GURL& requesting_origin, 195 const GURL& requesting_origin,
196 const GURL& embedding_origin) override; 196 const GURL& embedding_origin) override;
197 void ResetPermission( 197 void ResetPermission(
198 content::PermissionType permission, 198 content::PermissionType permission,
199 content::BrowserContext* browser_context, 199 content::BrowserContext* browser_context,
200 const GURL& requesting_origin, 200 const GURL& requesting_origin,
201 const GURL& embedding_origin) override; 201 const GURL& embedding_origin) override;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 348 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
349 349
350 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 350 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
351 351
352 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 352 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
353 }; 353 };
354 354
355 } // namespace chrome 355 } // namespace chrome
356 356
357 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 357 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698