Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: chrome/browser/extensions/component_loader.cc

Issue 1150443002: kiosk: Load pdf extension in kiosk sessions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 bool skip_session_components) { 525 bool skip_session_components) {
526 // No component extension for kiosk app launch splash screen. 526 // No component extension for kiosk app launch splash screen.
527 if (skip_session_components) 527 if (skip_session_components)
528 return; 528 return;
529 529
530 // Component extensions needed for kiosk apps. 530 // Component extensions needed for kiosk apps.
531 AddFileManagerExtension(); 531 AddFileManagerExtension();
532 532
533 // Add virtual keyboard. 533 // Add virtual keyboard.
534 AddKeyboardApp(); 534 AddKeyboardApp();
535
536 #if defined(ENABLE_PLUGINS)
537 Add(pdf_extension_util::GetManifest(),
538 base::FilePath(FILE_PATH_LITERAL("pdf")));
539 #endif
535 } 540 }
536 541
537 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( 542 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
538 bool skip_session_components) { 543 bool skip_session_components) {
539 const base::CommandLine* command_line = 544 const base::CommandLine* command_line =
540 base::CommandLine::ForCurrentProcess(); 545 base::CommandLine::ForCurrentProcess();
541 546
542 // Component extensions with background pages are not enabled during tests 547 // Component extensions with background pages are not enabled during tests
543 // because they generate a lot of background behavior that can interfere. 548 // because they generate a lot of background behavior that can interfere.
544 if (!enable_background_extensions_during_testing && 549 if (!enable_background_extensions_during_testing &&
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 688 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
684 storage::FileSystemContext* file_system_context = 689 storage::FileSystemContext* file_system_context =
685 content::BrowserContext::GetStoragePartitionForSite( 690 content::BrowserContext::GetStoragePartitionForSite(
686 off_the_record_context, site)->GetFileSystemContext(); 691 off_the_record_context, site)->GetFileSystemContext();
687 file_system_context->EnableTemporaryFileSystemInIncognito(); 692 file_system_context->EnableTemporaryFileSystemInIncognito();
688 } 693 }
689 #endif 694 #endif
690 } 695 }
691 696
692 } // namespace extensions 697 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698