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

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

Issue 246293011: Mount MTP devices in Chrome OS Files.app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + fix test (handle null StorageMonitor in some tests) Created 6 years, 7 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/file_manager/volume_manager.h » ('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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 #include "sandbox/win/src/sandbox_policy.h" 159 #include "sandbox/win/src/sandbox_policy.h"
160 #elif defined(OS_MACOSX) 160 #elif defined(OS_MACOSX)
161 #include "chrome/browser/chrome_browser_main_mac.h" 161 #include "chrome/browser/chrome_browser_main_mac.h"
162 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 162 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
163 #include "components/breakpad/app/breakpad_mac.h" 163 #include "components/breakpad/app/breakpad_mac.h"
164 #elif defined(OS_CHROMEOS) 164 #elif defined(OS_CHROMEOS)
165 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 165 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
166 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 166 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
167 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 167 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
168 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 168 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
169 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
169 #include "chrome/browser/chromeos/login/startup_utils.h" 170 #include "chrome/browser/chromeos/login/startup_utils.h"
170 #include "chrome/browser/chromeos/login/user_manager.h" 171 #include "chrome/browser/chromeos/login/user_manager.h"
171 #include "chrome/browser/chromeos/system/input_device_settings.h" 172 #include "chrome/browser/chromeos/system/input_device_settings.h"
172 #include "chromeos/chromeos_switches.h" 173 #include "chromeos/chromeos_switches.h"
173 #elif defined(OS_LINUX) 174 #elif defined(OS_LINUX)
174 #include "chrome/browser/chrome_browser_main_linux.h" 175 #include "chrome/browser/chrome_browser_main_linux.h"
175 #elif defined(OS_ANDROID) 176 #elif defined(OS_ANDROID)
176 #include "chrome/browser/android/new_tab_page_url_handler.h" 177 #include "chrome/browser/android/new_tab_page_url_handler.h"
177 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 178 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
178 #include "chrome/browser/chrome_browser_main_android.h" 179 #include "chrome/browser/chrome_browser_main_android.h"
(...skipping 2312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2491 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( 2492 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2492 MediaFileSystemBackend::kMediaTaskRunnerName)).get())); 2493 MediaFileSystemBackend::kMediaTaskRunnerName)).get()));
2493 #endif 2494 #endif
2494 #if defined(OS_CHROMEOS) 2495 #if defined(OS_CHROMEOS)
2495 fileapi::ExternalMountPoints* external_mount_points = 2496 fileapi::ExternalMountPoints* external_mount_points =
2496 content::BrowserContext::GetMountPoints(browser_context); 2497 content::BrowserContext::GetMountPoints(browser_context);
2497 DCHECK(external_mount_points); 2498 DCHECK(external_mount_points);
2498 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( 2499 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
2499 new drive::FileSystemBackendDelegate, 2500 new drive::FileSystemBackendDelegate,
2500 new chromeos::file_system_provider::BackendDelegate, 2501 new chromeos::file_system_provider::BackendDelegate,
2502 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path),
2501 browser_context->GetSpecialStoragePolicy(), 2503 browser_context->GetSpecialStoragePolicy(),
2502 external_mount_points, 2504 external_mount_points,
2503 fileapi::ExternalMountPoints::GetSystemInstance()); 2505 fileapi::ExternalMountPoints::GetSystemInstance());
2504 backend->AddSystemMountPoints(); 2506 backend->AddSystemMountPoints();
2505 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); 2507 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2506 additional_backends->push_back(backend); 2508 additional_backends->push_back(backend);
2507 #endif 2509 #endif
2508 2510
2509 additional_backends->push_back( 2511 additional_backends->push_back(
2510 new sync_file_system::SyncFileSystemBackend( 2512 new sync_file_system::SyncFileSystemBackend(
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
2666 switches::kDisableWebRtcEncryption, 2668 switches::kDisableWebRtcEncryption,
2667 }; 2669 };
2668 to_command_line->CopySwitchesFrom(from_command_line, 2670 to_command_line->CopySwitchesFrom(from_command_line,
2669 kWebRtcDevSwitchNames, 2671 kWebRtcDevSwitchNames,
2670 arraysize(kWebRtcDevSwitchNames)); 2672 arraysize(kWebRtcDevSwitchNames));
2671 } 2673 }
2672 } 2674 }
2673 #endif // defined(ENABLE_WEBRTC) 2675 #endif // defined(ENABLE_WEBRTC)
2674 2676
2675 } // namespace chrome 2677 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/file_manager/volume_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698