OLD | NEW |
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 #include "webkit/plugins/plugin_switches.h" | 141 #include "webkit/plugins/plugin_switches.h" |
142 | 142 |
143 #if defined(OS_WIN) | 143 #if defined(OS_WIN) |
144 #include "chrome/browser/chrome_browser_main_win.h" | 144 #include "chrome/browser/chrome_browser_main_win.h" |
145 #include "sandbox/win/src/sandbox_policy.h" | 145 #include "sandbox/win/src/sandbox_policy.h" |
146 #elif defined(OS_MACOSX) | 146 #elif defined(OS_MACOSX) |
147 #include "chrome/browser/chrome_browser_main_mac.h" | 147 #include "chrome/browser/chrome_browser_main_mac.h" |
148 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" | 148 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" |
149 #elif defined(OS_CHROMEOS) | 149 #elif defined(OS_CHROMEOS) |
150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 151 #include "chrome/browser/chromeos/drive/mount_point_provider_delegate.h" |
151 #include "chrome/browser/chromeos/fileapi/cros_mount_point_provider.h" | 152 #include "chrome/browser/chromeos/fileapi/cros_mount_point_provider.h" |
152 #include "chrome/browser/chromeos/login/startup_utils.h" | 153 #include "chrome/browser/chromeos/login/startup_utils.h" |
153 #include "chrome/browser/chromeos/login/user_manager.h" | 154 #include "chrome/browser/chromeos/login/user_manager.h" |
154 #include "chrome/browser/chromeos/system/statistics_provider.h" | 155 #include "chrome/browser/chromeos/system/statistics_provider.h" |
155 #include "chromeos/chromeos_switches.h" | 156 #include "chromeos/chromeos_switches.h" |
156 #elif defined(OS_LINUX) | 157 #elif defined(OS_LINUX) |
157 #include "chrome/browser/chrome_browser_main_linux.h" | 158 #include "chrome/browser/chrome_browser_main_linux.h" |
158 #elif defined(OS_ANDROID) | 159 #elif defined(OS_ANDROID) |
159 #include "chrome/browser/android/crash_dump_manager.h" | 160 #include "chrome/browser/android/crash_dump_manager.h" |
160 #include "chrome/browser/chrome_browser_main_android.h" | 161 #include "chrome/browser/chrome_browser_main_android.h" |
(...skipping 2143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2304 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); | 2305 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); |
2305 additional_providers->push_back(new MediaFileSystemMountPointProvider( | 2306 additional_providers->push_back(new MediaFileSystemMountPointProvider( |
2306 storage_partition_path, | 2307 storage_partition_path, |
2307 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( | 2308 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( |
2308 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); | 2309 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); |
2309 #endif | 2310 #endif |
2310 #if defined(OS_CHROMEOS) | 2311 #if defined(OS_CHROMEOS) |
2311 DCHECK(external_mount_points); | 2312 DCHECK(external_mount_points); |
2312 chromeos::CrosMountPointProvider* cros_mount_provider = | 2313 chromeos::CrosMountPointProvider* cros_mount_provider = |
2313 new chromeos::CrosMountPointProvider( | 2314 new chromeos::CrosMountPointProvider( |
| 2315 new drive::MountPointProviderDelegate(external_mount_points), |
2314 special_storage_policy, | 2316 special_storage_policy, |
2315 external_mount_points, | 2317 external_mount_points, |
2316 fileapi::ExternalMountPoints::GetSystemInstance()); | 2318 fileapi::ExternalMountPoints::GetSystemInstance()); |
2317 cros_mount_provider->AddSystemMountPoints(); | 2319 cros_mount_provider->AddSystemMountPoints(); |
2318 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal)); | 2320 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal)); |
2319 additional_providers->push_back(cros_mount_provider); | 2321 additional_providers->push_back(cros_mount_provider); |
2320 #endif | 2322 #endif |
2321 } | 2323 } |
2322 | 2324 |
2323 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 2325 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2420 #if defined(USE_NSS) | 2422 #if defined(USE_NSS) |
2421 crypto::CryptoModuleBlockingPasswordDelegate* | 2423 crypto::CryptoModuleBlockingPasswordDelegate* |
2422 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2424 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2423 const GURL& url) { | 2425 const GURL& url) { |
2424 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2426 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2425 chrome::kCryptoModulePasswordKeygen, url.host()); | 2427 chrome::kCryptoModulePasswordKeygen, url.host()); |
2426 } | 2428 } |
2427 #endif | 2429 #endif |
2428 | 2430 |
2429 } // namespace chrome | 2431 } // namespace chrome |
OLD | NEW |