OLD | NEW |
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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
639 chrome::kChromeUIScheme, | 639 chrome::kChromeUIScheme, |
640 ChromeURLDataManagerBackend::CreateProtocolHandler( | 640 ChromeURLDataManagerBackend::CreateProtocolHandler( |
641 chrome_url_data_manager_backend_.get())); | 641 chrome_url_data_manager_backend_.get())); |
642 DCHECK(set_protocol); | 642 DCHECK(set_protocol); |
643 set_protocol = job_factory->SetProtocolHandler( | 643 set_protocol = job_factory->SetProtocolHandler( |
644 chrome::kDataScheme, new net::DataProtocolHandler()); | 644 chrome::kDataScheme, new net::DataProtocolHandler()); |
645 DCHECK(set_protocol); | 645 DCHECK(set_protocol); |
646 #if defined(OS_CHROMEOS) | 646 #if defined(OS_CHROMEOS) |
647 if (!is_incognito()) { | 647 if (!is_incognito()) { |
648 set_protocol = job_factory->SetProtocolHandler( | 648 set_protocol = job_factory->SetProtocolHandler( |
649 chrome::kDriveScheme, new drive::DriveProtocolHandler()); | 649 chrome::kDriveScheme, |
| 650 new drive::DriveProtocolHandler(profile_params_->profile)); |
650 DCHECK(set_protocol); | 651 DCHECK(set_protocol); |
651 } | 652 } |
652 #endif // defined(OS_CHROMEOS) | 653 #endif // defined(OS_CHROMEOS) |
653 | 654 |
654 job_factory->SetProtocolHandler( | 655 job_factory->SetProtocolHandler( |
655 chrome::kAboutScheme, | 656 chrome::kAboutScheme, |
656 new chrome_browser_net::AboutProtocolHandler()); | 657 new chrome_browser_net::AboutProtocolHandler()); |
657 #if !defined(DISABLE_FTP_SUPPORT) | 658 #if !defined(DISABLE_FTP_SUPPORT) |
658 DCHECK(ftp_transaction_factory); | 659 DCHECK(ftp_transaction_factory); |
659 job_factory->SetProtocolHandler( | 660 job_factory->SetProtocolHandler( |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
728 void ProfileIOData::SetCookieSettingsForTesting( | 729 void ProfileIOData::SetCookieSettingsForTesting( |
729 CookieSettings* cookie_settings) { | 730 CookieSettings* cookie_settings) { |
730 DCHECK(!cookie_settings_.get()); | 731 DCHECK(!cookie_settings_.get()); |
731 cookie_settings_ = cookie_settings; | 732 cookie_settings_ = cookie_settings; |
732 } | 733 } |
733 | 734 |
734 void ProfileIOData::set_signin_names_for_testing( | 735 void ProfileIOData::set_signin_names_for_testing( |
735 SigninNamesOnIOThread* signin_names) { | 736 SigninNamesOnIOThread* signin_names) { |
736 signin_names_.reset(signin_names); | 737 signin_names_.reset(signin_names); |
737 } | 738 } |
OLD | NEW |