Chromium Code Reviews| 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 433 AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components); | 433 AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components); |
| 434 } | 434 } |
| 435 | 435 |
| 436 void ComponentLoader::AddDefaultComponentExtensionsForKioskMode( | 436 void ComponentLoader::AddDefaultComponentExtensionsForKioskMode( |
| 437 bool skip_session_components) { | 437 bool skip_session_components) { |
| 438 // No component extension for kiosk app launch splash screen. | 438 // No component extension for kiosk app launch splash screen. |
| 439 if (skip_session_components) | 439 if (skip_session_components) |
| 440 return; | 440 return; |
| 441 | 441 |
| 442 // Component extensions needed for kiosk apps. | 442 // Component extensions needed for kiosk apps. |
| 443 // Note: Video player should be avove the file manager, since the video | |
|
hirono
2014/03/28 05:35:22
Why the comments are removed?
yoshiki
2014/03/28 06:53:10
Because, we no longer need to care about the load
| |
| 444 // player is the default app for video files by default. | |
| 445 AddVideoPlayerExtension(); | 443 AddVideoPlayerExtension(); |
| 446 AddFileManagerExtension(); | 444 AddFileManagerExtension(); |
| 447 | 445 |
| 448 // Add virtual keyboard. | 446 // Add virtual keyboard. |
| 449 AddKeyboardApp(); | 447 AddKeyboardApp(); |
| 450 } | 448 } |
| 451 | 449 |
| 452 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( | 450 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( |
| 453 bool skip_session_components) { | 451 bool skip_session_components) { |
| 454 const CommandLine* command_line = CommandLine::ForCurrentProcess(); | 452 const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 466 // Since this is a v2 app it has a background page. | 464 // Since this is a v2 app it has a background page. |
| 467 if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) { | 465 if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) { |
| 468 AddWithName(IDR_GENIUS_APP_MANIFEST, | 466 AddWithName(IDR_GENIUS_APP_MANIFEST, |
| 469 base::FilePath(FILE_PATH_LITERAL( | 467 base::FilePath(FILE_PATH_LITERAL( |
| 470 "/usr/share/chromeos-assets/genius_app")), | 468 "/usr/share/chromeos-assets/genius_app")), |
| 471 l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME)); | 469 l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME)); |
| 472 } | 470 } |
| 473 #endif | 471 #endif |
| 474 | 472 |
| 475 if (!skip_session_components) { | 473 if (!skip_session_components) { |
| 476 // Note: Video player should be avove the file manager, since the video | |
| 477 // player is the default app for video files by default. | |
| 478 AddVideoPlayerExtension(); | 474 AddVideoPlayerExtension(); |
| 479 AddFileManagerExtension(); | 475 AddFileManagerExtension(); |
| 480 | 476 |
| 481 AddHangoutServicesExtension(); | 477 AddHangoutServicesExtension(); |
| 482 AddHotwordHelperExtension(); | 478 AddHotwordHelperExtension(); |
| 483 AddImageLoaderExtension(); | 479 AddImageLoaderExtension(); |
| 484 | 480 |
| 485 #if defined(ENABLE_SETTINGS_APP) | 481 #if defined(ENABLE_SETTINGS_APP) |
| 486 Add(IDR_SETTINGS_APP_MANIFEST, | 482 Add(IDR_SETTINGS_APP_MANIFEST, |
| 487 base::FilePath(FILE_PATH_LITERAL("settings_app"))); | 483 base::FilePath(FILE_PATH_LITERAL("settings_app"))); |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 618 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); | 614 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); |
| 619 fileapi::FileSystemContext* file_system_context = | 615 fileapi::FileSystemContext* file_system_context = |
| 620 content::BrowserContext::GetStoragePartitionForSite( | 616 content::BrowserContext::GetStoragePartitionForSite( |
| 621 off_the_record_context, site)->GetFileSystemContext(); | 617 off_the_record_context, site)->GetFileSystemContext(); |
| 622 file_system_context->EnableTemporaryFileSystemInIncognito(); | 618 file_system_context->EnableTemporaryFileSystemInIncognito(); |
| 623 } | 619 } |
| 624 #endif | 620 #endif |
| 625 } | 621 } |
| 626 | 622 |
| 627 } // namespace extensions | 623 } // namespace extensions |
| OLD | NEW |