| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/shell_content_browser_client.h" | 5 #include "content/shell/browser/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 callback.Run(Shell::CreateNewWindow(browser_context, | 366 callback.Run(Shell::CreateNewWindow(browser_context, |
| 367 params.url, | 367 params.url, |
| 368 nullptr, | 368 nullptr, |
| 369 gfx::Size())->web_contents()); | 369 gfx::Size())->web_contents()); |
| 370 } | 370 } |
| 371 | 371 |
| 372 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 372 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 373 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 373 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| 374 const base::CommandLine& command_line, | 374 const base::CommandLine& command_line, |
| 375 int child_process_id, | 375 int child_process_id, |
| 376 content::FileDescriptorInfo* mappings) { | 376 content::PosixFileDescriptorInfo* mappings) { |
| 377 #if defined(OS_ANDROID) | 377 #if defined(OS_ANDROID) |
| 378 mappings->ShareWithRegion( | 378 mappings->ShareWithRegion( |
| 379 kShellPakDescriptor, | 379 kShellPakDescriptor, |
| 380 base::GlobalDescriptors::GetInstance()->Get(kShellPakDescriptor), | 380 base::GlobalDescriptors::GetInstance()->Get(kShellPakDescriptor), |
| 381 base::GlobalDescriptors::GetInstance()->GetRegion(kShellPakDescriptor)); | 381 base::GlobalDescriptors::GetInstance()->GetRegion(kShellPakDescriptor)); |
| 382 | 382 |
| 383 breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted( | 383 breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted( |
| 384 child_process_id, mappings); | 384 child_process_id, mappings); |
| 385 #else | 385 #else |
| 386 int crash_signal_fd = GetCrashSignalFD(command_line); | 386 int crash_signal_fd = GetCrashSignalFD(command_line); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 411 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 411 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
| 412 return shell_browser_main_parts_->browser_context(); | 412 return shell_browser_main_parts_->browser_context(); |
| 413 } | 413 } |
| 414 | 414 |
| 415 ShellBrowserContext* | 415 ShellBrowserContext* |
| 416 ShellContentBrowserClient::off_the_record_browser_context() { | 416 ShellContentBrowserClient::off_the_record_browser_context() { |
| 417 return shell_browser_main_parts_->off_the_record_browser_context(); | 417 return shell_browser_main_parts_->off_the_record_browser_context(); |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace content | 420 } // namespace content |
| OLD | NEW |