script: Fix merge fallout.

This commit is contained in:
Patrick Walton 2015-07-30 22:35:12 -07:00
parent 2aa5174246
commit 024c4df912
4 changed files with 14 additions and 11 deletions

View file

@ -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(),