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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 } | 324 } |
325 | 325 |
326 void ComponentLoader::AddGalleryExtension() { | 326 void ComponentLoader::AddGalleryExtension() { |
327 #if defined(OS_CHROMEOS) | 327 #if defined(OS_CHROMEOS) |
328 Add(IDR_GALLERY_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gallery"))); | 328 Add(IDR_GALLERY_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gallery"))); |
329 #endif | 329 #endif |
330 } | 330 } |
331 | 331 |
332 void ComponentLoader::AddWebstoreWidgetExtension() { | 332 void ComponentLoader::AddWebstoreWidgetExtension() { |
333 #if defined(OS_CHROMEOS) | 333 #if defined(OS_CHROMEOS) |
334 Add(IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST, | 334 AddWithNameAndDescription( |
335 base::FilePath(FILE_PATH_LITERAL("webstore_widget"))); | 335 IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST, |
| 336 base::FilePath(FILE_PATH_LITERAL("webstore_widget")), |
| 337 IDS_WEBSTORE_WIDGET_APP_NAME, |
| 338 IDS_WEBSTORE_WIDGET_APP_DESC); |
336 #endif | 339 #endif |
337 } | 340 } |
338 | 341 |
339 void ComponentLoader::AddHangoutServicesExtension() { | 342 void ComponentLoader::AddHangoutServicesExtension() { |
340 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION) | 343 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION) |
341 Add(IDR_HANGOUT_SERVICES_MANIFEST, | 344 Add(IDR_HANGOUT_SERVICES_MANIFEST, |
342 base::FilePath(FILE_PATH_LITERAL("hangout_services"))); | 345 base::FilePath(FILE_PATH_LITERAL("hangout_services"))); |
343 #endif | 346 #endif |
344 } | 347 } |
345 | 348 |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
680 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); | 683 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); |
681 storage::FileSystemContext* file_system_context = | 684 storage::FileSystemContext* file_system_context = |
682 content::BrowserContext::GetStoragePartitionForSite( | 685 content::BrowserContext::GetStoragePartitionForSite( |
683 off_the_record_context, site)->GetFileSystemContext(); | 686 off_the_record_context, site)->GetFileSystemContext(); |
684 file_system_context->EnableTemporaryFileSystemInIncognito(); | 687 file_system_context->EnableTemporaryFileSystemInIncognito(); |
685 } | 688 } |
686 #endif | 689 #endif |
687 } | 690 } |
688 | 691 |
689 } // namespace extensions | 692 } // namespace extensions |
OLD | NEW |