mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
script: Fix merge fallout.
This commit is contained in:
parent
2aa5174246
commit
024c4df912
4 changed files with 14 additions and 11 deletions
|
@ -250,7 +250,7 @@ impl ResourceChannelManager {
|
|||
}
|
||||
}
|
||||
|
||||
struct ResourceManager {
|
||||
pub struct ResourceManager {
|
||||
user_agent: Option<String>,
|
||||
cookie_storage: CookieStorage,
|
||||
resource_task: IpcSender<ControlMsg>,
|
||||
|
@ -260,10 +260,10 @@ struct ResourceManager {
|
|||
}
|
||||
|
||||
impl ResourceManager {
|
||||
fn new(user_agent: Option<String>,
|
||||
resource_task: IpcSender<ControlMsg>,
|
||||
hsts_list: HSTSList,
|
||||
devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager {
|
||||
pub fn new(user_agent: Option<String>,
|
||||
resource_task: IpcSender<ControlMsg>,
|
||||
hsts_list: HSTSList,
|
||||
devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager {
|
||||
ResourceManager {
|
||||
user_agent: user_agent,
|
||||
cookie_storage: CookieStorage::new(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue