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

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

Issue 492693004: Delete Privet filesystem code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc » ('j') | 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/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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" 228 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
229 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 229 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
230 #include "extensions/browser/suggest_permission_util.h" 230 #include "extensions/browser/suggest_permission_util.h"
231 #include "extensions/common/manifest_handlers/background_info.h" 231 #include "extensions/common/manifest_handlers/background_info.h"
232 #endif 232 #endif
233 233
234 #if defined(ENABLE_SPELLCHECK) 234 #if defined(ENABLE_SPELLCHECK)
235 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 235 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
236 #endif 236 #endif
237 237
238 #if defined(ENABLE_SERVICE_DISCOVERY)
239 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
240 #endif
241
242 #if defined(ENABLE_WEBRTC) 238 #if defined(ENABLE_WEBRTC)
243 #include "chrome/browser/media/webrtc_logging_handler_host.h" 239 #include "chrome/browser/media/webrtc_logging_handler_host.h"
244 #endif 240 #endif
245 241
246 using base::FileDescriptor; 242 using base::FileDescriptor;
247 using blink::WebWindowFeatures; 243 using blink::WebWindowFeatures;
248 using content::AccessTokenStore; 244 using content::AccessTokenStore;
249 using content::BrowserThread; 245 using content::BrowserThread;
250 using content::BrowserURLHandler; 246 using content::BrowserURLHandler;
251 using content::ChildProcessSecurityPolicy; 247 using content::ChildProcessSecurityPolicy;
(...skipping 2120 matching lines...) Expand 10 before | Expand all | Expand 10 after
2372 new chromeos::file_system_provider::BackendDelegate, 2368 new chromeos::file_system_provider::BackendDelegate,
2373 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path), 2369 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path),
2374 browser_context->GetSpecialStoragePolicy(), 2370 browser_context->GetSpecialStoragePolicy(),
2375 external_mount_points, 2371 external_mount_points,
2376 storage::ExternalMountPoints::GetSystemInstance()); 2372 storage::ExternalMountPoints::GetSystemInstance());
2377 backend->AddSystemMountPoints(); 2373 backend->AddSystemMountPoints();
2378 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal)); 2374 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal));
2379 additional_backends->push_back(backend); 2375 additional_backends->push_back(backend);
2380 #endif 2376 #endif
2381 2377
2382 #if defined(ENABLE_SERVICE_DISCOVERY)
2383 if (CommandLine::ForCurrentProcess()->HasSwitch(
2384 switches::kEnablePrivetStorage)) {
2385 additional_backends->push_back(new local_discovery::PrivetFileSystemBackend(
2386 storage::ExternalMountPoints::GetSystemInstance(), browser_context));
2387 }
2388 #endif
2389
2390 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2378 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2391 extra_parts_[i]->GetAdditionalFileSystemBackends( 2379 extra_parts_[i]->GetAdditionalFileSystemBackends(
2392 browser_context, storage_partition_path, additional_backends); 2380 browser_context, storage_partition_path, additional_backends);
2393 } 2381 }
2394 } 2382 }
2395 2383
2396 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2384 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2397 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2385 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2398 const CommandLine& command_line, 2386 const CommandLine& command_line,
2399 int child_process_id, 2387 int child_process_id,
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 switches::kDisableWebRtcEncryption, 2573 switches::kDisableWebRtcEncryption,
2586 }; 2574 };
2587 to_command_line->CopySwitchesFrom(from_command_line, 2575 to_command_line->CopySwitchesFrom(from_command_line,
2588 kWebRtcDevSwitchNames, 2576 kWebRtcDevSwitchNames,
2589 arraysize(kWebRtcDevSwitchNames)); 2577 arraysize(kWebRtcDevSwitchNames));
2590 } 2578 }
2591 } 2579 }
2592 #endif // defined(ENABLE_WEBRTC) 2580 #endif // defined(ENABLE_WEBRTC)
2593 2581
2594 } // namespace chrome 2582 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698