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 #include "content/public/browser/content_browser_client.h" | 5 #include "content/public/browser/content_browser_client.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "ui/gfx/image/image_skia.h" | 8 #include "ui/gfx/image/image_skia.h" |
9 #include "url/gurl.h" | 9 #include "url/gurl.h" |
10 | 10 |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 WebKit::WebNotificationPresenter::Permission | 206 WebKit::WebNotificationPresenter::Permission |
207 ContentBrowserClient::CheckDesktopNotificationPermission( | 207 ContentBrowserClient::CheckDesktopNotificationPermission( |
208 const GURL& source_origin, | 208 const GURL& source_origin, |
209 ResourceContext* context, | 209 ResourceContext* context, |
210 int render_process_id) { | 210 int render_process_id) { |
211 return WebKit::WebNotificationPresenter::PermissionAllowed; | 211 return WebKit::WebNotificationPresenter::PermissionAllowed; |
212 } | 212 } |
213 | 213 |
214 bool ContentBrowserClient::CanCreateWindow( | 214 bool ContentBrowserClient::CanCreateWindow( |
215 const GURL& opener_url, | 215 const GURL& opener_url, |
| 216 const GURL& opener_top_level_frame_url, |
216 const GURL& source_origin, | 217 const GURL& source_origin, |
217 WindowContainerType container_type, | 218 WindowContainerType container_type, |
218 const GURL& target_url, | 219 const GURL& target_url, |
219 const content::Referrer& referrer, | 220 const content::Referrer& referrer, |
220 WindowOpenDisposition disposition, | 221 WindowOpenDisposition disposition, |
221 const WebKit::WebWindowFeatures& features, | 222 const WebKit::WebWindowFeatures& features, |
222 bool user_gesture, | 223 bool user_gesture, |
223 bool opener_suppressed, | 224 bool opener_suppressed, |
224 content::ResourceContext* context, | 225 content::ResourceContext* context, |
225 int render_process_id, | 226 int render_process_id, |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 #endif | 295 #endif |
295 | 296 |
296 #if defined(USE_NSS) | 297 #if defined(USE_NSS) |
297 crypto::CryptoModuleBlockingPasswordDelegate* | 298 crypto::CryptoModuleBlockingPasswordDelegate* |
298 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 299 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
299 return NULL; | 300 return NULL; |
300 } | 301 } |
301 #endif | 302 #endif |
302 | 303 |
303 } // namespace content | 304 } // namespace content |
OLD | NEW |