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

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

Issue 141703022: Support for file listing in privet local filesystem (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 2525 matching lines...) Expand 10 before | Expand all | Expand 10 after
2536 #endif 2536 #endif
2537 2537
2538 additional_backends->push_back( 2538 additional_backends->push_back(
2539 new sync_file_system::SyncFileSystemBackend( 2539 new sync_file_system::SyncFileSystemBackend(
2540 Profile::FromBrowserContext(browser_context))); 2540 Profile::FromBrowserContext(browser_context)));
2541 2541
2542 if (CommandLine::ForCurrentProcess()->HasSwitch( 2542 if (CommandLine::ForCurrentProcess()->HasSwitch(
2543 switches::kEnablePrivetStorage)) { 2543 switches::kEnablePrivetStorage)) {
2544 additional_backends->push_back( 2544 additional_backends->push_back(
2545 new local_discovery::PrivetFileSystemBackend( 2545 new local_discovery::PrivetFileSystemBackend(
2546 fileapi::ExternalMountPoints::GetSystemInstance())); 2546 fileapi::ExternalMountPoints::GetSystemInstance(),
2547 browser_context));
2547 } 2548 }
2548 } 2549 }
2549 2550
2550 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2551 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2551 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2552 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2552 const CommandLine& command_line, 2553 const CommandLine& command_line,
2553 int child_process_id, 2554 int child_process_id,
2554 std::vector<FileDescriptorInfo>* mappings) { 2555 std::vector<FileDescriptorInfo>* mappings) {
2555 #if defined(OS_ANDROID) 2556 #if defined(OS_ANDROID)
2556 base::FilePath data_path; 2557 base::FilePath data_path;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
2671 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2672 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2672 // Chromium builds as well. 2673 // Chromium builds as well.
2673 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2674 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2674 #else 2675 #else
2675 return false; 2676 return false;
2676 #endif 2677 #endif
2677 } 2678 }
2678 2679
2679 2680
2680 } // namespace chrome 2681 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/local_discovery/storage/path_util.h » ('j') | chrome/chrome_tests_unit.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698