| 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 <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 echo_extension_path = command_line->GetSwitchValuePath( | 510 echo_extension_path = command_line->GetSwitchValuePath( |
| 511 chromeos::switches::kEchoExtensionPath); | 511 chromeos::switches::kEchoExtensionPath); |
| 512 } | 512 } |
| 513 Add(IDR_ECHO_MANIFEST, echo_extension_path); | 513 Add(IDR_ECHO_MANIFEST, echo_extension_path); |
| 514 | 514 |
| 515 if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) { | 515 if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) { |
| 516 Add(IDR_WALLPAPERMANAGER_MANIFEST, | 516 Add(IDR_WALLPAPERMANAGER_MANIFEST, |
| 517 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); | 517 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); |
| 518 } | 518 } |
| 519 | 519 |
| 520 if (!command_line->HasSwitch(chromeos::switches::kDisableFirstRunUI)) { | 520 Add(IDR_FIRST_RUN_DIALOG_MANIFEST, |
| 521 Add(IDR_FIRST_RUN_DIALOG_MANIFEST, | 521 base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app"))); |
| 522 base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app"))); | |
| 523 } | |
| 524 | 522 |
| 525 Add(IDR_NETWORK_CONFIGURATION_MANIFEST, | 523 Add(IDR_NETWORK_CONFIGURATION_MANIFEST, |
| 526 base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); | 524 base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); |
| 527 | 525 |
| 528 Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, | 526 Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, |
| 529 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); | 527 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); |
| 530 Add(IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST, | 528 Add(IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST, |
| 531 base::FilePath(extension_misc::kConnectivityDiagnosticsLauncherPath)); | 529 base::FilePath(extension_misc::kConnectivityDiagnosticsLauncherPath)); |
| 532 } | 530 } |
| 533 | 531 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); | 617 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); |
| 620 fileapi::FileSystemContext* file_system_context = | 618 fileapi::FileSystemContext* file_system_context = |
| 621 content::BrowserContext::GetStoragePartitionForSite( | 619 content::BrowserContext::GetStoragePartitionForSite( |
| 622 off_the_record_context, site)->GetFileSystemContext(); | 620 off_the_record_context, site)->GetFileSystemContext(); |
| 623 file_system_context->EnableTemporaryFileSystemInIncognito(); | 621 file_system_context->EnableTemporaryFileSystemInIncognito(); |
| 624 } | 622 } |
| 625 #endif | 623 #endif |
| 626 } | 624 } |
| 627 | 625 |
| 628 } // namespace extensions | 626 } // namespace extensions |
| OLD | NEW |