| 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 "chrome/browser/extensions/component_loader.h" | 5 #include "chrome/browser/extensions/component_loader.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 #if !defined(OS_CHROMEOS) // http://crbug.com/314799 | 617 #if !defined(OS_CHROMEOS) // http://crbug.com/314799 |
| 618 AddNetworkSpeechSynthesisExtension(); | 618 AddNetworkSpeechSynthesisExtension(); |
| 619 #endif | 619 #endif |
| 620 | 620 |
| 621 #endif // defined(GOOGLE_CHROME_BUILD) | 621 #endif // defined(GOOGLE_CHROME_BUILD) |
| 622 | 622 |
| 623 #if defined(ENABLE_PLUGINS) | 623 #if defined(ENABLE_PLUGINS) |
| 624 base::FilePath pdf_path; | 624 base::FilePath pdf_path; |
| 625 content::PluginService* plugin_service = | 625 content::PluginService* plugin_service = |
| 626 content::PluginService::GetInstance(); | 626 content::PluginService::GetInstance(); |
| 627 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kOutOfProcessPdf) && | 627 if (switches::OutOfProcessPdfEnabled() && |
| 628 PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path) && | 628 PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path) && |
| 629 plugin_service->GetRegisteredPpapiPluginInfo(pdf_path)) { | 629 plugin_service->GetRegisteredPpapiPluginInfo(pdf_path)) { |
| 630 Add(IDR_PDF_MANIFEST, base::FilePath(FILE_PATH_LITERAL("pdf"))); | 630 Add(IDR_PDF_MANIFEST, base::FilePath(FILE_PATH_LITERAL("pdf"))); |
| 631 } | 631 } |
| 632 #endif | 632 #endif |
| 633 | 633 |
| 634 Add(IDR_CRYPTOTOKEN_MANIFEST, | 634 Add(IDR_CRYPTOTOKEN_MANIFEST, |
| 635 base::FilePath(FILE_PATH_LITERAL("cryptotoken"))); | 635 base::FilePath(FILE_PATH_LITERAL("cryptotoken"))); |
| 636 } | 636 } |
| 637 | 637 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 658 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); | 658 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); |
| 659 storage::FileSystemContext* file_system_context = | 659 storage::FileSystemContext* file_system_context = |
| 660 content::BrowserContext::GetStoragePartitionForSite( | 660 content::BrowserContext::GetStoragePartitionForSite( |
| 661 off_the_record_context, site)->GetFileSystemContext(); | 661 off_the_record_context, site)->GetFileSystemContext(); |
| 662 file_system_context->EnableTemporaryFileSystemInIncognito(); | 662 file_system_context->EnableTemporaryFileSystemInIncognito(); |
| 663 } | 663 } |
| 664 #endif | 664 #endif |
| 665 } | 665 } |
| 666 | 666 |
| 667 } // namespace extensions | 667 } // namespace extensions |
| OLD | NEW |