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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
190 int render_process_id, | 190 int render_process_id, |
191 scoped_ptr<content::DesktopNotificationDelegate> delegate, | 191 scoped_ptr<content::DesktopNotificationDelegate> delegate, |
192 base::Closure* cancel_callback) override; | 192 base::Closure* cancel_callback) override; |
193 void RequestPermission( | 193 void RequestPermission( |
194 content::PermissionType permission, | 194 content::PermissionType permission, |
195 content::WebContents* web_contents, | 195 content::WebContents* web_contents, |
196 int bridge_id, | 196 int bridge_id, |
197 const GURL& requesting_frame, | 197 const GURL& requesting_frame, |
198 bool user_gesture, | 198 bool user_gesture, |
199 const base::Callback<void(bool)>& result_callback) override; | 199 const base::Callback<void(bool)>& result_callback) override; |
200 virtual content::PermissionStatus GetPermissionStatus( | |
mlamouri (slow - plz ping)
2014/11/27 18:18:29
nit: remove "virtual", we no longer require "virtu
timvolodine
2014/11/28 14:49:19
Done.
| |
201 content::PermissionType permission, | |
202 content::BrowserContext* browser_context, | |
203 const GURL& requesting_origin, | |
204 const GURL& embedding_origin) override; | |
200 void CancelPermissionRequest(content::PermissionType permission, | 205 void CancelPermissionRequest(content::PermissionType permission, |
201 content::WebContents* web_contents, | 206 content::WebContents* web_contents, |
202 int bridge_id, | 207 int bridge_id, |
203 const GURL& requesting_frame) override; | 208 const GURL& requesting_frame) override; |
204 void RegisterPermissionUsage(content::PermissionType permission, | 209 void RegisterPermissionUsage(content::PermissionType permission, |
205 content::WebContents* web_contents, | 210 content::WebContents* web_contents, |
206 const GURL& frame_url, | 211 const GURL& frame_url, |
207 const GURL& main_frame_url) override; | 212 const GURL& main_frame_url) override; |
208 bool CanCreateWindow(const GURL& opener_url, | 213 bool CanCreateWindow(const GURL& opener_url, |
209 const GURL& opener_top_level_frame_url, | 214 const GURL& opener_top_level_frame_url, |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
331 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 336 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
332 | 337 |
333 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 338 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
334 | 339 |
335 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 340 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
336 }; | 341 }; |
337 | 342 |
338 } // namespace chrome | 343 } // namespace chrome |
339 | 344 |
340 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 345 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |