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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 580023003: Rename the drive: scheme with the externalfile: scheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed. Created 6 years, 3 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
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/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" 100 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
101 #endif 101 #endif
102 102
103 #if defined(OS_ANDROID) 103 #if defined(OS_ANDROID)
104 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 104 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
105 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" 105 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
106 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h " 106 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h "
107 #endif // defined(OS_ANDROID) 107 #endif // defined(OS_ANDROID)
108 108
109 #if defined(OS_CHROMEOS) 109 #if defined(OS_CHROMEOS)
110 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" 110 #include "chrome/browser/chromeos/fileapi/external_file_protocol_handler.h"
111 #include "chrome/browser/chromeos/login/startup_utils.h" 111 #include "chrome/browser/chromeos/login/startup_utils.h"
112 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 112 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
113 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 113 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
114 #include "chrome/browser/chromeos/policy/policy_cert_service.h" 114 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
115 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 115 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
116 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 116 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
117 #include "chrome/browser/chromeos/profiles/profile_helper.h" 117 #include "chrome/browser/chromeos/profiles/profile_helper.h"
118 #include "chrome/browser/chromeos/settings/cros_settings.h" 118 #include "chrome/browser/chromeos/settings/cros_settings.h"
119 #include "chrome/browser/net/nss_context.h" 119 #include "chrome/browser/net/nss_context.h"
120 #include "chromeos/dbus/cryptohome_client.h" 120 #include "chromeos/dbus/cryptohome_client.h"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 url::kFileScheme, 673 url::kFileScheme,
674 content::kChromeDevToolsScheme, 674 content::kChromeDevToolsScheme,
675 dom_distiller::kDomDistillerScheme, 675 dom_distiller::kDomDistillerScheme,
676 #if defined(ENABLE_EXTENSIONS) 676 #if defined(ENABLE_EXTENSIONS)
677 extensions::kExtensionScheme, 677 extensions::kExtensionScheme,
678 extensions::kExtensionResourceScheme, 678 extensions::kExtensionResourceScheme,
679 #endif 679 #endif
680 content::kChromeUIScheme, 680 content::kChromeUIScheme,
681 url::kDataScheme, 681 url::kDataScheme,
682 #if defined(OS_CHROMEOS) 682 #if defined(OS_CHROMEOS)
683 chrome::kDriveScheme, 683 chrome::kExternalFileScheme,
684 #endif // defined(OS_CHROMEOS) 684 #endif // defined(OS_CHROMEOS)
685 url::kAboutScheme, 685 url::kAboutScheme,
686 #if !defined(DISABLE_FTP_SUPPORT) 686 #if !defined(DISABLE_FTP_SUPPORT)
687 url::kFtpScheme, 687 url::kFtpScheme,
688 #endif // !defined(DISABLE_FTP_SUPPORT) 688 #endif // !defined(DISABLE_FTP_SUPPORT)
689 url::kBlobScheme, 689 url::kBlobScheme,
690 url::kFileSystemScheme, 690 url::kFileSystemScheme,
691 chrome::kChromeSearchScheme, 691 chrome::kChromeSearchScheme,
692 }; 692 };
693 for (size_t i = 0; i < arraysize(kProtocolList); ++i) { 693 for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 extensions::kExtensionResourceScheme, 1126 extensions::kExtensionResourceScheme,
1127 CreateExtensionResourceProtocolHandler()); 1127 CreateExtensionResourceProtocolHandler());
1128 DCHECK(set_protocol); 1128 DCHECK(set_protocol);
1129 #endif 1129 #endif
1130 set_protocol = job_factory->SetProtocolHandler( 1130 set_protocol = job_factory->SetProtocolHandler(
1131 url::kDataScheme, new net::DataProtocolHandler()); 1131 url::kDataScheme, new net::DataProtocolHandler());
1132 DCHECK(set_protocol); 1132 DCHECK(set_protocol);
1133 #if defined(OS_CHROMEOS) 1133 #if defined(OS_CHROMEOS)
1134 if (profile_params_) { 1134 if (profile_params_) {
1135 set_protocol = job_factory->SetProtocolHandler( 1135 set_protocol = job_factory->SetProtocolHandler(
1136 chrome::kDriveScheme, 1136 chrome::kExternalFileScheme,
1137 new drive::DriveProtocolHandler(profile_params_->profile)); 1137 new chromeos::ExternalFileProtocolHandler(profile_params_->profile));
1138 DCHECK(set_protocol); 1138 DCHECK(set_protocol);
1139 } 1139 }
1140 #endif // defined(OS_CHROMEOS) 1140 #endif // defined(OS_CHROMEOS)
1141 1141
1142 job_factory->SetProtocolHandler( 1142 job_factory->SetProtocolHandler(
1143 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); 1143 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler());
1144 #if !defined(DISABLE_FTP_SUPPORT) 1144 #if !defined(DISABLE_FTP_SUPPORT)
1145 DCHECK(ftp_transaction_factory); 1145 DCHECK(ftp_transaction_factory);
1146 job_factory->SetProtocolHandler( 1146 job_factory->SetProtocolHandler(
1147 url::kFtpScheme, 1147 url::kFtpScheme,
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 void ProfileIOData::SetCookieSettingsForTesting( 1276 void ProfileIOData::SetCookieSettingsForTesting(
1277 CookieSettings* cookie_settings) { 1277 CookieSettings* cookie_settings) {
1278 DCHECK(!cookie_settings_.get()); 1278 DCHECK(!cookie_settings_.get());
1279 cookie_settings_ = cookie_settings; 1279 cookie_settings_ = cookie_settings;
1280 } 1280 }
1281 1281
1282 void ProfileIOData::set_signin_names_for_testing( 1282 void ProfileIOData::set_signin_names_for_testing(
1283 SigninNamesOnIOThread* signin_names) { 1283 SigninNamesOnIOThread* signin_names) {
1284 signin_names_.reset(signin_names); 1284 signin_names_.reset(signin_names);
1285 } 1285 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698