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 "android_webview/browser/aw_content_browser_client.h" | 5 #include "android_webview/browser/aw_content_browser_client.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "android_webview/browser/aw_browser_context.h" | 9 #include "android_webview/browser/aw_browser_context.h" |
10 #include "android_webview/browser/aw_browser_main_parts.h" | 10 #include "android_webview/browser/aw_browser_main_parts.h" |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 | 477 |
478 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 478 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
479 const base::CommandLine& command_line, | 479 const base::CommandLine& command_line, |
480 int child_process_id, | 480 int child_process_id, |
481 content::FileDescriptorInfo* mappings, | 481 content::FileDescriptorInfo* mappings, |
482 std::map<int, base::MemoryMappedFile::Region>* regions) { | 482 std::map<int, base::MemoryMappedFile::Region>* regions) { |
483 int fd = ui::GetMainAndroidPackFd( | 483 int fd = ui::GetMainAndroidPackFd( |
484 &(*regions)[kAndroidWebViewMainPakDescriptor]); | 484 &(*regions)[kAndroidWebViewMainPakDescriptor]); |
485 mappings->Share(kAndroidWebViewMainPakDescriptor, fd); | 485 mappings->Share(kAndroidWebViewMainPakDescriptor, fd); |
486 | 486 |
| 487 fd = ui::GetCommonResourcesPackFd( |
| 488 &(*regions)[kAndroidWebView100PercentPakDescriptor]); |
| 489 mappings->Share(kAndroidWebView100PercentPakDescriptor, fd); |
| 490 |
487 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]); | 491 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]); |
488 mappings->Share(kAndroidWebViewLocalePakDescriptor, fd); | 492 mappings->Share(kAndroidWebViewLocalePakDescriptor, fd); |
489 | 493 |
490 base::ScopedFD crash_signal_file = | 494 base::ScopedFD crash_signal_file = |
491 breakpad::CrashMicroDumpManager::GetInstance()->CreateCrashInfoChannel( | 495 breakpad::CrashMicroDumpManager::GetInstance()->CreateCrashInfoChannel( |
492 child_process_id); | 496 child_process_id); |
493 if (crash_signal_file.is_valid()) { | 497 if (crash_signal_file.is_valid()) { |
494 mappings->Transfer(kAndroidWebViewCrashSignalDescriptor, | 498 mappings->Transfer(kAndroidWebViewCrashSignalDescriptor, |
495 std::move(crash_signal_file)); | 499 std::move(crash_signal_file)); |
496 } | 500 } |
(...skipping 24 matching lines...) Expand all Loading... |
521 } | 525 } |
522 return throttles; | 526 return throttles; |
523 } | 527 } |
524 | 528 |
525 content::DevToolsManagerDelegate* | 529 content::DevToolsManagerDelegate* |
526 AwContentBrowserClient::GetDevToolsManagerDelegate() { | 530 AwContentBrowserClient::GetDevToolsManagerDelegate() { |
527 return new AwDevToolsManagerDelegate(); | 531 return new AwDevToolsManagerDelegate(); |
528 } | 532 } |
529 | 533 |
530 } // namespace android_webview | 534 } // namespace android_webview |
OLD | NEW |