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/shell/shell_content_browser_client.h" | 5 #include "content/shell/shell_content_browser_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "content/shell/shell.h" | 9 #include "content/shell/shell.h" |
10 #include "content/shell/shell_browser_main.h" | 10 #include "content/shell/shell_browser_main.h" |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 bool worker) { | 256 bool worker) { |
257 } | 257 } |
258 | 258 |
259 void ShellContentBrowserClient::CancelDesktopNotification( | 259 void ShellContentBrowserClient::CancelDesktopNotification( |
260 int render_process_id, | 260 int render_process_id, |
261 int render_view_id, | 261 int render_view_id, |
262 int notification_id) { | 262 int notification_id) { |
263 } | 263 } |
264 | 264 |
265 bool ShellContentBrowserClient::CanCreateWindow( | 265 bool ShellContentBrowserClient::CanCreateWindow( |
| 266 const GURL& opener_url, |
266 const GURL& origin, | 267 const GURL& origin, |
267 WindowContainerType container_type, | 268 WindowContainerType container_type, |
268 content::ResourceContext* context, | 269 content::ResourceContext* context, |
269 int render_process_id) { | 270 int render_process_id) { |
270 return true; | 271 return true; |
271 } | 272 } |
272 | 273 |
273 std::string ShellContentBrowserClient::GetWorkerProcessTitle( | 274 std::string ShellContentBrowserClient::GetWorkerProcessTitle( |
274 const GURL& url, content::ResourceContext* context) { | 275 const GURL& url, content::ResourceContext* context) { |
275 return std::string(); | 276 return std::string(); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 #endif | 349 #endif |
349 | 350 |
350 #if defined(USE_NSS) | 351 #if defined(USE_NSS) |
351 crypto::CryptoModuleBlockingPasswordDelegate* | 352 crypto::CryptoModuleBlockingPasswordDelegate* |
352 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 353 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
353 return NULL; | 354 return NULL; |
354 } | 355 } |
355 #endif | 356 #endif |
356 | 357 |
357 } // namespace content | 358 } // namespace content |
OLD | NEW |