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

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

Issue 18612002: Extract Drive related code to drive::MountPointProviderDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/drive/mount_point_provider_delegate.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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 2148 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2310 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2310 additional_providers->push_back(new MediaFileSystemMountPointProvider( 2311 additional_providers->push_back(new MediaFileSystemMountPointProvider(
2311 storage_partition_path, 2312 storage_partition_path,
2312 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( 2313 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2313 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); 2314 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get()));
2314 #endif 2315 #endif
2315 #if defined(OS_CHROMEOS) 2316 #if defined(OS_CHROMEOS)
2316 DCHECK(external_mount_points); 2317 DCHECK(external_mount_points);
2317 chromeos::CrosMountPointProvider* cros_mount_provider = 2318 chromeos::CrosMountPointProvider* cros_mount_provider =
2318 new chromeos::CrosMountPointProvider( 2319 new chromeos::CrosMountPointProvider(
2320 new drive::MountPointProviderDelegate(external_mount_points),
2319 special_storage_policy, 2321 special_storage_policy,
2320 external_mount_points, 2322 external_mount_points,
2321 fileapi::ExternalMountPoints::GetSystemInstance()); 2323 fileapi::ExternalMountPoints::GetSystemInstance());
2322 cros_mount_provider->AddSystemMountPoints(); 2324 cros_mount_provider->AddSystemMountPoints();
2323 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal)); 2325 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal));
2324 additional_providers->push_back(cros_mount_provider); 2326 additional_providers->push_back(cros_mount_provider);
2325 #endif 2327 #endif
2326 } 2328 }
2327 2329
2328 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2330 #if defined(OS_POSIX) && !defined(OS_MACOSX)
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
2425 #if defined(USE_NSS) 2427 #if defined(USE_NSS)
2426 crypto::CryptoModuleBlockingPasswordDelegate* 2428 crypto::CryptoModuleBlockingPasswordDelegate*
2427 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2429 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2428 const GURL& url) { 2430 const GURL& url) {
2429 return chrome::NewCryptoModuleBlockingDialogDelegate( 2431 return chrome::NewCryptoModuleBlockingDialogDelegate(
2430 chrome::kCryptoModulePasswordKeygen, url.host()); 2432 chrome::kCryptoModulePasswordKeygen, url.host());
2431 } 2433 }
2432 #endif 2434 #endif
2433 2435
2434 } // namespace chrome 2436 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/mount_point_provider_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698