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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 Add(IDR_GOOGLE_NOW_MANIFEST, | 562 Add(IDR_GOOGLE_NOW_MANIFEST, |
563 base::FilePath(FILE_PATH_LITERAL("google_now"))); | 563 base::FilePath(FILE_PATH_LITERAL("google_now"))); |
564 } | 564 } |
565 #endif | 565 #endif |
566 | 566 |
567 #if defined(GOOGLE_CHROME_BUILD) | 567 #if defined(GOOGLE_CHROME_BUILD) |
568 #if !defined(OS_CHROMEOS) // http://crbug.com/314799 | 568 #if !defined(OS_CHROMEOS) // http://crbug.com/314799 |
569 AddNetworkSpeechSynthesisExtension(); | 569 AddNetworkSpeechSynthesisExtension(); |
570 #endif | 570 #endif |
571 | 571 |
572 if (command_line->HasSwitch(switches::kEnableEasyUnlock)) { | 572 if (!skip_session_components && |
| 573 command_line->HasSwitch(switches::kEnableEasyUnlock)) { |
573 if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) { | 574 if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) { |
574 base::FilePath easy_unlock_path( | 575 base::FilePath easy_unlock_path( |
575 command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath)); | 576 command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath)); |
576 Add(IDR_EASY_UNLOCK_MANIFEST, easy_unlock_path); | 577 Add(IDR_EASY_UNLOCK_MANIFEST, easy_unlock_path); |
577 } else { | 578 } else { |
578 #if defined(OS_CHROMEOS) | 579 #if defined(OS_CHROMEOS) |
579 Add(IDR_EASY_UNLOCK_MANIFEST, | 580 Add(IDR_EASY_UNLOCK_MANIFEST, |
580 base::FilePath( | 581 base::FilePath( |
581 FILE_PATH_LITERAL("/usr/share/chromeos-assets/easy_unlock"))); | 582 FILE_PATH_LITERAL("/usr/share/chromeos-assets/easy_unlock"))); |
582 #endif | 583 #endif |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); | 623 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); |
623 fileapi::FileSystemContext* file_system_context = | 624 fileapi::FileSystemContext* file_system_context = |
624 content::BrowserContext::GetStoragePartitionForSite( | 625 content::BrowserContext::GetStoragePartitionForSite( |
625 off_the_record_context, site)->GetFileSystemContext(); | 626 off_the_record_context, site)->GetFileSystemContext(); |
626 file_system_context->EnableTemporaryFileSystemInIncognito(); | 627 file_system_context->EnableTemporaryFileSystemInIncognito(); |
627 } | 628 } |
628 #endif | 629 #endif |
629 } | 630 } |
630 | 631 |
631 } // namespace extensions | 632 } // namespace extensions |
OLD | NEW |