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_parts.h" | 10 #include "content/shell/shell_browser_main_parts.h" |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 int render_process_id, | 250 int render_process_id, |
251 int render_view_id, | 251 int render_view_id, |
252 int notification_id) { | 252 int notification_id) { |
253 } | 253 } |
254 | 254 |
255 bool ShellContentBrowserClient::CanCreateWindow( | 255 bool ShellContentBrowserClient::CanCreateWindow( |
256 const GURL& opener_url, | 256 const GURL& opener_url, |
257 const GURL& origin, | 257 const GURL& origin, |
258 WindowContainerType container_type, | 258 WindowContainerType container_type, |
259 content::ResourceContext* context, | 259 content::ResourceContext* context, |
260 int render_process_id) { | 260 int render_process_id, |
| 261 bool* no_javascript_access) { |
| 262 *no_javascript_access = false; |
261 return true; | 263 return true; |
262 } | 264 } |
263 | 265 |
264 std::string ShellContentBrowserClient::GetWorkerProcessTitle( | 266 std::string ShellContentBrowserClient::GetWorkerProcessTitle( |
265 const GURL& url, content::ResourceContext* context) { | 267 const GURL& url, content::ResourceContext* context) { |
266 return std::string(); | 268 return std::string(); |
267 } | 269 } |
268 | 270 |
269 void ShellContentBrowserClient::ResourceDispatcherHostCreated() { | 271 void ShellContentBrowserClient::ResourceDispatcherHostCreated() { |
270 } | 272 } |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 345 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
344 return NULL; | 346 return NULL; |
345 } | 347 } |
346 #endif | 348 #endif |
347 | 349 |
348 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 350 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
349 return shell_browser_main_parts_->browser_context(); | 351 return shell_browser_main_parts_->browser_context(); |
350 } | 352 } |
351 | 353 |
352 } // namespace content | 354 } // namespace content |
OLD | NEW |