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

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

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx Created 6 years, 6 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
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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 url::kFileScheme, 619 url::kFileScheme,
620 content::kChromeDevToolsScheme, 620 content::kChromeDevToolsScheme,
621 chrome::kDomDistillerScheme, 621 chrome::kDomDistillerScheme,
622 extensions::kExtensionScheme, 622 extensions::kExtensionScheme,
623 extensions::kExtensionResourceScheme, 623 extensions::kExtensionResourceScheme,
624 content::kChromeUIScheme, 624 content::kChromeUIScheme,
625 url::kDataScheme, 625 url::kDataScheme,
626 #if defined(OS_CHROMEOS) 626 #if defined(OS_CHROMEOS)
627 chrome::kDriveScheme, 627 chrome::kDriveScheme,
628 #endif // defined(OS_CHROMEOS) 628 #endif // defined(OS_CHROMEOS)
629 content::kAboutScheme, 629 url::kAboutScheme,
630 #if !defined(DISABLE_FTP_SUPPORT) 630 #if !defined(DISABLE_FTP_SUPPORT)
631 url::kFtpScheme, 631 url::kFtpScheme,
632 #endif // !defined(DISABLE_FTP_SUPPORT) 632 #endif // !defined(DISABLE_FTP_SUPPORT)
633 url::kBlobScheme, 633 url::kBlobScheme,
634 url::kFileSystemScheme, 634 url::kFileSystemScheme,
635 chrome::kChromeSearchScheme, 635 chrome::kChromeSearchScheme,
636 }; 636 };
637 for (size_t i = 0; i < arraysize(kProtocolList); ++i) { 637 for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
638 if (scheme == kProtocolList[i]) 638 if (scheme == kProtocolList[i])
639 return true; 639 return true;
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 #if defined(OS_CHROMEOS) 1059 #if defined(OS_CHROMEOS)
1060 if (profile_params_) { 1060 if (profile_params_) {
1061 set_protocol = job_factory->SetProtocolHandler( 1061 set_protocol = job_factory->SetProtocolHandler(
1062 chrome::kDriveScheme, 1062 chrome::kDriveScheme,
1063 new drive::DriveProtocolHandler(profile_params_->profile)); 1063 new drive::DriveProtocolHandler(profile_params_->profile));
1064 DCHECK(set_protocol); 1064 DCHECK(set_protocol);
1065 } 1065 }
1066 #endif // defined(OS_CHROMEOS) 1066 #endif // defined(OS_CHROMEOS)
1067 1067
1068 job_factory->SetProtocolHandler( 1068 job_factory->SetProtocolHandler(
1069 content::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); 1069 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler());
1070 #if !defined(DISABLE_FTP_SUPPORT) 1070 #if !defined(DISABLE_FTP_SUPPORT)
1071 DCHECK(ftp_transaction_factory); 1071 DCHECK(ftp_transaction_factory);
1072 job_factory->SetProtocolHandler( 1072 job_factory->SetProtocolHandler(
1073 url::kFtpScheme, 1073 url::kFtpScheme,
1074 new net::FtpProtocolHandler(ftp_transaction_factory)); 1074 new net::FtpProtocolHandler(ftp_transaction_factory));
1075 #endif // !defined(DISABLE_FTP_SUPPORT) 1075 #endif // !defined(DISABLE_FTP_SUPPORT)
1076 1076
1077 #if defined(DEBUG_DEVTOOLS) 1077 #if defined(DEBUG_DEVTOOLS)
1078 request_interceptors.push_back(new DebugDevToolsInterceptor); 1078 request_interceptors.push_back(new DebugDevToolsInterceptor);
1079 #endif 1079 #endif
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 void ProfileIOData::SetCookieSettingsForTesting( 1188 void ProfileIOData::SetCookieSettingsForTesting(
1189 CookieSettings* cookie_settings) { 1189 CookieSettings* cookie_settings) {
1190 DCHECK(!cookie_settings_.get()); 1190 DCHECK(!cookie_settings_.get());
1191 cookie_settings_ = cookie_settings; 1191 cookie_settings_ = cookie_settings;
1192 } 1192 }
1193 1193
1194 void ProfileIOData::set_signin_names_for_testing( 1194 void ProfileIOData::set_signin_names_for_testing(
1195 SigninNamesOnIOThread* signin_names) { 1195 SigninNamesOnIOThread* signin_names) {
1196 signin_names_.reset(signin_names); 1196 signin_names_.reset(signin_names);
1197 } 1197 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698