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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 185393012: Change media galleries to external file system type to add toURL support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mac/Win compile Created 6 years, 9 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 | Annotate | Revision Log
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/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 30 matching lines...) Expand all
41 #include "chrome/browser/extensions/suggest_permission_util.h" 41 #include "chrome/browser/extensions/suggest_permission_util.h"
42 #include "chrome/browser/geolocation/chrome_access_token_store.h" 42 #include "chrome/browser/geolocation/chrome_access_token_store.h"
43 #include "chrome/browser/google/google_util.h" 43 #include "chrome/browser/google/google_util.h"
44 #include "chrome/browser/guestview/adview/adview_guest.h" 44 #include "chrome/browser/guestview/adview/adview_guest.h"
45 #include "chrome/browser/guestview/guestview.h" 45 #include "chrome/browser/guestview/guestview.h"
46 #include "chrome/browser/guestview/guestview_constants.h" 46 #include "chrome/browser/guestview/guestview_constants.h"
47 #include "chrome/browser/guestview/webview/webview_guest.h" 47 #include "chrome/browser/guestview/webview/webview_guest.h"
48 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h" 48 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
49 #include "chrome/browser/media/cast_transport_host_filter.h" 49 #include "chrome/browser/media/cast_transport_host_filter.h"
50 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 50 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
51 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
Lei Zhang 2014/03/20 00:46:26 Already on line 207.
vandebo (ex-Chrome) 2014/03/20 18:08:53 Done.
51 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 52 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
52 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 53 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
53 #include "chrome/browser/net/chrome_net_log.h" 54 #include "chrome/browser/net/chrome_net_log.h"
54 #include "chrome/browser/notifications/desktop_notification_service.h" 55 #include "chrome/browser/notifications/desktop_notification_service.h"
55 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 56 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
56 #include "chrome/browser/platform_util.h" 57 #include "chrome/browser/platform_util.h"
57 #include "chrome/browser/plugins/plugin_info_message_filter.h" 58 #include "chrome/browser/plugins/plugin_info_message_filter.h"
58 #include "chrome/browser/prerender/prerender_final_status.h" 59 #include "chrome/browser/prerender/prerender_final_status.h"
59 #include "chrome/browser/prerender/prerender_manager.h" 60 #include "chrome/browser/prerender/prerender_manager.h"
60 #include "chrome/browser/prerender/prerender_manager_factory.h" 61 #include "chrome/browser/prerender/prerender_manager_factory.h"
(...skipping 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 std::vector<std::string>* additional_allowed_schemes) { 2552 std::vector<std::string>* additional_allowed_schemes) {
2552 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2553 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2553 additional_allowed_schemes); 2554 additional_allowed_schemes);
2554 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2555 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2555 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2556 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2556 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2557 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2557 } 2558 }
2558 2559
2559 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2560 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2560 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { 2561 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) {
2562 #if !defined(OS_ANDROID)
2563 handlers->push_back(
2564 base::Bind(MediaFileSystemBackend::AttemptAutoMountForURLRequest));
2565 #endif // OS_ANDROID
2561 } 2566 }
2562 2567
2563 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2568 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2564 content::BrowserContext* browser_context, 2569 content::BrowserContext* browser_context,
2565 const base::FilePath& storage_partition_path, 2570 const base::FilePath& storage_partition_path,
2566 ScopedVector<fileapi::FileSystemBackend>* additional_backends) { 2571 ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
2567 #if !defined(OS_ANDROID) 2572 #if !defined(OS_ANDROID)
2568 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2573 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2569 additional_backends->push_back(new MediaFileSystemBackend( 2574 additional_backends->push_back(new MediaFileSystemBackend(
2570 storage_partition_path, 2575 storage_partition_path,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2746 switches::kDisableWebRtcEncryption, 2751 switches::kDisableWebRtcEncryption,
2747 }; 2752 };
2748 to_command_line->CopySwitchesFrom(from_command_line, 2753 to_command_line->CopySwitchesFrom(from_command_line,
2749 kWebRtcDevSwitchNames, 2754 kWebRtcDevSwitchNames,
2750 arraysize(kWebRtcDevSwitchNames)); 2755 arraysize(kWebRtcDevSwitchNames));
2751 } 2756 }
2752 } 2757 }
2753 #endif // defined(ENABLE_WEBRTC) 2758 #endif // defined(ENABLE_WEBRTC)
2754 2759
2755 } // namespace chrome 2760 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698