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

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: Rebased. Created 6 years, 2 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 | « chrome/browser/chromeos/fileapi/file_system_backend.cc ('k') | chrome/browser/ui/browser.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/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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" 108 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
109 #endif 109 #endif
110 110
111 #if defined(OS_ANDROID) 111 #if defined(OS_ANDROID)
112 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 112 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
113 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" 113 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
114 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h " 114 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h "
115 #endif // defined(OS_ANDROID) 115 #endif // defined(OS_ANDROID)
116 116
117 #if defined(OS_CHROMEOS) 117 #if defined(OS_CHROMEOS)
118 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" 118 #include "chrome/browser/chromeos/fileapi/external_file_protocol_handler.h"
119 #include "chrome/browser/chromeos/login/startup_utils.h" 119 #include "chrome/browser/chromeos/login/startup_utils.h"
120 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 120 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
121 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 121 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
122 #include "chrome/browser/chromeos/policy/policy_cert_service.h" 122 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
123 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 123 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
124 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 124 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
125 #include "chrome/browser/chromeos/profiles/profile_helper.h" 125 #include "chrome/browser/chromeos/profiles/profile_helper.h"
126 #include "chrome/browser/chromeos/settings/cros_settings.h" 126 #include "chrome/browser/chromeos/settings/cros_settings.h"
127 #include "chrome/browser/net/nss_context.h" 127 #include "chrome/browser/net/nss_context.h"
128 #include "chromeos/dbus/cryptohome_client.h" 128 #include "chromeos/dbus/cryptohome_client.h"
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 url::kFileScheme, 688 url::kFileScheme,
689 content::kChromeDevToolsScheme, 689 content::kChromeDevToolsScheme,
690 dom_distiller::kDomDistillerScheme, 690 dom_distiller::kDomDistillerScheme,
691 #if defined(ENABLE_EXTENSIONS) 691 #if defined(ENABLE_EXTENSIONS)
692 extensions::kExtensionScheme, 692 extensions::kExtensionScheme,
693 extensions::kExtensionResourceScheme, 693 extensions::kExtensionResourceScheme,
694 #endif 694 #endif
695 content::kChromeUIScheme, 695 content::kChromeUIScheme,
696 url::kDataScheme, 696 url::kDataScheme,
697 #if defined(OS_CHROMEOS) 697 #if defined(OS_CHROMEOS)
698 chrome::kDriveScheme, 698 chrome::kExternalFileScheme,
699 #endif // defined(OS_CHROMEOS) 699 #endif // defined(OS_CHROMEOS)
700 url::kAboutScheme, 700 url::kAboutScheme,
701 #if !defined(DISABLE_FTP_SUPPORT) 701 #if !defined(DISABLE_FTP_SUPPORT)
702 url::kFtpScheme, 702 url::kFtpScheme,
703 #endif // !defined(DISABLE_FTP_SUPPORT) 703 #endif // !defined(DISABLE_FTP_SUPPORT)
704 url::kBlobScheme, 704 url::kBlobScheme,
705 url::kFileSystemScheme, 705 url::kFileSystemScheme,
706 chrome::kChromeSearchScheme, 706 chrome::kChromeSearchScheme,
707 }; 707 };
708 for (size_t i = 0; i < arraysize(kProtocolList); ++i) { 708 for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 extensions::kExtensionResourceScheme, 1137 extensions::kExtensionResourceScheme,
1138 CreateExtensionResourceProtocolHandler()); 1138 CreateExtensionResourceProtocolHandler());
1139 DCHECK(set_protocol); 1139 DCHECK(set_protocol);
1140 #endif 1140 #endif
1141 set_protocol = job_factory->SetProtocolHandler( 1141 set_protocol = job_factory->SetProtocolHandler(
1142 url::kDataScheme, new net::DataProtocolHandler()); 1142 url::kDataScheme, new net::DataProtocolHandler());
1143 DCHECK(set_protocol); 1143 DCHECK(set_protocol);
1144 #if defined(OS_CHROMEOS) 1144 #if defined(OS_CHROMEOS)
1145 if (profile_params_) { 1145 if (profile_params_) {
1146 set_protocol = job_factory->SetProtocolHandler( 1146 set_protocol = job_factory->SetProtocolHandler(
1147 chrome::kDriveScheme, 1147 chrome::kExternalFileScheme,
1148 new drive::DriveProtocolHandler(profile_params_->profile)); 1148 new chromeos::ExternalFileProtocolHandler(profile_params_->profile));
1149 DCHECK(set_protocol); 1149 DCHECK(set_protocol);
1150 } 1150 }
1151 #endif // defined(OS_CHROMEOS) 1151 #endif // defined(OS_CHROMEOS)
1152 1152
1153 job_factory->SetProtocolHandler( 1153 job_factory->SetProtocolHandler(
1154 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); 1154 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler());
1155 #if !defined(DISABLE_FTP_SUPPORT) 1155 #if !defined(DISABLE_FTP_SUPPORT)
1156 DCHECK(ftp_transaction_factory); 1156 DCHECK(ftp_transaction_factory);
1157 job_factory->SetProtocolHandler( 1157 job_factory->SetProtocolHandler(
1158 url::kFtpScheme, 1158 url::kFtpScheme,
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 void ProfileIOData::SetCookieSettingsForTesting( 1285 void ProfileIOData::SetCookieSettingsForTesting(
1286 CookieSettings* cookie_settings) { 1286 CookieSettings* cookie_settings) {
1287 DCHECK(!cookie_settings_.get()); 1287 DCHECK(!cookie_settings_.get());
1288 cookie_settings_ = cookie_settings; 1288 cookie_settings_ = cookie_settings;
1289 } 1289 }
1290 1290
1291 void ProfileIOData::set_signin_names_for_testing( 1291 void ProfileIOData::set_signin_names_for_testing(
1292 SigninNamesOnIOThread* signin_names) { 1292 SigninNamesOnIOThread* signin_names) {
1293 signin_names_.reset(signin_names); 1293 signin_names_.reset(signin_names);
1294 } 1294 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/fileapi/file_system_backend.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698