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

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

Issue 310613002: Enable drive: protocol in incognito windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | 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 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 extension_info_map_.get())); 1048 extension_info_map_.get()));
1049 DCHECK(set_protocol); 1049 DCHECK(set_protocol);
1050 set_protocol = job_factory->SetProtocolHandler( 1050 set_protocol = job_factory->SetProtocolHandler(
1051 extensions::kExtensionResourceScheme, 1051 extensions::kExtensionResourceScheme,
1052 CreateExtensionResourceProtocolHandler()); 1052 CreateExtensionResourceProtocolHandler());
1053 DCHECK(set_protocol); 1053 DCHECK(set_protocol);
1054 set_protocol = job_factory->SetProtocolHandler( 1054 set_protocol = job_factory->SetProtocolHandler(
1055 url::kDataScheme, new net::DataProtocolHandler()); 1055 url::kDataScheme, new net::DataProtocolHandler());
1056 DCHECK(set_protocol); 1056 DCHECK(set_protocol);
1057 #if defined(OS_CHROMEOS) 1057 #if defined(OS_CHROMEOS)
1058 if (!IsOffTheRecord() && profile_params_) { 1058 if (profile_params_) {
1059 set_protocol = job_factory->SetProtocolHandler( 1059 set_protocol = job_factory->SetProtocolHandler(
1060 chrome::kDriveScheme, 1060 chrome::kDriveScheme,
1061 new drive::DriveProtocolHandler(profile_params_->profile)); 1061 new drive::DriveProtocolHandler(profile_params_->profile));
1062 DCHECK(set_protocol); 1062 DCHECK(set_protocol);
1063 } 1063 }
1064 #endif // defined(OS_CHROMEOS) 1064 #endif // defined(OS_CHROMEOS)
1065 1065
1066 job_factory->SetProtocolHandler( 1066 job_factory->SetProtocolHandler(
1067 content::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); 1067 content::kAboutScheme, new chrome_browser_net::AboutProtocolHandler());
1068 #if !defined(DISABLE_FTP_SUPPORT) 1068 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 void ProfileIOData::SetCookieSettingsForTesting( 1170 void ProfileIOData::SetCookieSettingsForTesting(
1171 CookieSettings* cookie_settings) { 1171 CookieSettings* cookie_settings) {
1172 DCHECK(!cookie_settings_.get()); 1172 DCHECK(!cookie_settings_.get());
1173 cookie_settings_ = cookie_settings; 1173 cookie_settings_ = cookie_settings;
1174 } 1174 }
1175 1175
1176 void ProfileIOData::set_signin_names_for_testing( 1176 void ProfileIOData::set_signin_names_for_testing(
1177 SigninNamesOnIOThread* signin_names) { 1177 SigninNamesOnIOThread* signin_names) {
1178 signin_names_.reset(signin_names); 1178 signin_names_.reset(signin_names);
1179 } 1179 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698