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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 28 matching lines...) Expand all Loading... |
39 #include "chrome/browser/extensions/extension_system.h" | 39 #include "chrome/browser/extensions/extension_system.h" |
40 #include "chrome/browser/extensions/extension_web_ui.h" | 40 #include "chrome/browser/extensions/extension_web_ui.h" |
41 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 41 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
42 #include "chrome/browser/extensions/suggest_permission_util.h" | 42 #include "chrome/browser/extensions/suggest_permission_util.h" |
43 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 43 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
44 #include "chrome/browser/google/google_util.h" | 44 #include "chrome/browser/google/google_util.h" |
45 #include "chrome/browser/guestview/adview/adview_guest.h" | 45 #include "chrome/browser/guestview/adview/adview_guest.h" |
46 #include "chrome/browser/guestview/guestview.h" | 46 #include "chrome/browser/guestview/guestview.h" |
47 #include "chrome/browser/guestview/guestview_constants.h" | 47 #include "chrome/browser/guestview/guestview_constants.h" |
48 #include "chrome/browser/guestview/webview/webview_guest.h" | 48 #include "chrome/browser/guestview/webview/webview_guest.h" |
| 49 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h" |
49 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 50 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
50 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 51 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
51 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 52 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
52 #include "chrome/browser/net/chrome_net_log.h" | 53 #include "chrome/browser/net/chrome_net_log.h" |
53 #include "chrome/browser/notifications/desktop_notification_service.h" | 54 #include "chrome/browser/notifications/desktop_notification_service.h" |
54 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 55 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
55 #include "chrome/browser/platform_util.h" | 56 #include "chrome/browser/platform_util.h" |
56 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 57 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
57 #include "chrome/browser/prerender/prerender_final_status.h" | 58 #include "chrome/browser/prerender/prerender_final_status.h" |
58 #include "chrome/browser/prerender/prerender_manager.h" | 59 #include "chrome/browser/prerender/prerender_manager.h" |
(...skipping 2462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2521 external_mount_points, | 2522 external_mount_points, |
2522 fileapi::ExternalMountPoints::GetSystemInstance()); | 2523 fileapi::ExternalMountPoints::GetSystemInstance()); |
2523 backend->AddSystemMountPoints(); | 2524 backend->AddSystemMountPoints(); |
2524 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); | 2525 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); |
2525 additional_backends->push_back(backend); | 2526 additional_backends->push_back(backend); |
2526 #endif | 2527 #endif |
2527 | 2528 |
2528 additional_backends->push_back( | 2529 additional_backends->push_back( |
2529 new sync_file_system::SyncFileSystemBackend( | 2530 new sync_file_system::SyncFileSystemBackend( |
2530 Profile::FromBrowserContext(browser_context))); | 2531 Profile::FromBrowserContext(browser_context))); |
| 2532 |
| 2533 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 2534 switches::kEnablePrivetStorage)) { |
| 2535 additional_backends->push_back( |
| 2536 new local_discovery::PrivetFileSystemBackend( |
| 2537 fileapi::ExternalMountPoints::GetSystemInstance())); |
| 2538 } |
2531 } | 2539 } |
2532 | 2540 |
2533 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 2541 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
2534 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 2542 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
2535 const CommandLine& command_line, | 2543 const CommandLine& command_line, |
2536 int child_process_id, | 2544 int child_process_id, |
2537 std::vector<FileDescriptorInfo>* mappings) { | 2545 std::vector<FileDescriptorInfo>* mappings) { |
2538 #if defined(OS_ANDROID) | 2546 #if defined(OS_ANDROID) |
2539 base::FilePath data_path; | 2547 base::FilePath data_path; |
2540 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); | 2548 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2654 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on | 2662 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on |
2655 // Chromium builds as well. | 2663 // Chromium builds as well. |
2656 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 2664 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
2657 #else | 2665 #else |
2658 return false; | 2666 return false; |
2659 #endif | 2667 #endif |
2660 } | 2668 } |
2661 | 2669 |
2662 | 2670 |
2663 } // namespace chrome | 2671 } // namespace chrome |
OLD | NEW |