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

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

Issue 1030133002: Move the check for fileBrowserHandler permission to FileBrowserHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test for OS != OS_CHROMEOS. Created 5 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/file_manager/file_tasks_unittest.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 2304 matching lines...) Expand 10 before | Expand all | Expand 10 after
2315 const base::FilePath& storage_partition_path, 2315 const base::FilePath& storage_partition_path,
2316 ScopedVector<storage::FileSystemBackend>* additional_backends) { 2316 ScopedVector<storage::FileSystemBackend>* additional_backends) {
2317 #if defined(OS_CHROMEOS) 2317 #if defined(OS_CHROMEOS)
2318 storage::ExternalMountPoints* external_mount_points = 2318 storage::ExternalMountPoints* external_mount_points =
2319 content::BrowserContext::GetMountPoints(browser_context); 2319 content::BrowserContext::GetMountPoints(browser_context);
2320 DCHECK(external_mount_points); 2320 DCHECK(external_mount_points);
2321 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( 2321 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
2322 new drive::FileSystemBackendDelegate, 2322 new drive::FileSystemBackendDelegate,
2323 new chromeos::file_system_provider::BackendDelegate, 2323 new chromeos::file_system_provider::BackendDelegate,
2324 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path), 2324 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path),
2325 browser_context->GetSpecialStoragePolicy(),
2326 external_mount_points, 2325 external_mount_points,
2327 storage::ExternalMountPoints::GetSystemInstance()); 2326 storage::ExternalMountPoints::GetSystemInstance());
2328 backend->AddSystemMountPoints(); 2327 backend->AddSystemMountPoints();
2329 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal)); 2328 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal));
2330 additional_backends->push_back(backend); 2329 additional_backends->push_back(backend);
2331 #endif 2330 #endif
2332 2331
2333 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2332 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2334 extra_parts_[i]->GetAdditionalFileSystemBackends( 2333 extra_parts_[i]->GetAdditionalFileSystemBackends(
2335 browser_context, storage_partition_path, additional_backends); 2334 browser_context, storage_partition_path, additional_backends);
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
2573 switches::kDisableWebRtcEncryption, 2572 switches::kDisableWebRtcEncryption,
2574 }; 2573 };
2575 to_command_line->CopySwitchesFrom(from_command_line, 2574 to_command_line->CopySwitchesFrom(from_command_line,
2576 kWebRtcDevSwitchNames, 2575 kWebRtcDevSwitchNames,
2577 arraysize(kWebRtcDevSwitchNames)); 2576 arraysize(kWebRtcDevSwitchNames));
2578 } 2577 }
2579 } 2578 }
2580 #endif // defined(ENABLE_WEBRTC) 2579 #endif // defined(ENABLE_WEBRTC)
2581 2580
2582 } // namespace chrome 2581 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/file_manager/file_tasks_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698