Skip to content

Commit

Permalink
Add extensions for switching between content and chrome contexts.
Browse files Browse the repository at this point in the history
  • Loading branch information
jgraham committed Sep 21, 2015
1 parent 3ddc970 commit 4bd5c36
Show file tree
Hide file tree
Showing 4 changed files with 213 additions and 20 deletions.
67 changes: 67 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Expand Up @@ -8,12 +8,14 @@ license = "MPL-2.0"

[dependencies]
env_logger = "0.3.1"
hyper = "0.6.13"
log = "0.3.1"
mozprofile = "0.1.0"
mozrunner = "0.1.0"
rustc-serialize = "0.3.14"
uuid = "0.1.17"
mozrunner = "0.1.0"
mozprofile = "0.1.0"
webdriver = "0.3.1"
regex="0.1.41"

[dependencies.argparse]
git = "https://github.com/tailhook/rust-argparse.git"
8 changes: 5 additions & 3 deletions src/main.rs
@@ -1,10 +1,12 @@
#[macro_use]
extern crate log;
extern crate rustc_serialize;
extern crate argparse;
extern crate env_logger;
extern crate hyper;
extern crate mozprofile;
extern crate mozrunner;
extern crate regex;
extern crate rustc_serialize;
#[macro_use]
extern crate webdriver;

Expand All @@ -17,7 +19,7 @@ use std::path::Path;
use argparse::{ArgumentParser, StoreTrue, Store};
use webdriver::server::start;

use marionette::{MarionetteHandler, BrowserLauncher, MarionetteSettings};
use marionette::{MarionetteHandler, BrowserLauncher, MarionetteSettings, extension_routes};

macro_rules! try_opt {
($expr:expr, $err_type:expr, $err_msg:expr) => ({
Expand Down Expand Up @@ -100,5 +102,5 @@ fn main() {
launcher);

//TODO: what if binary isn't a valid path?
start(addr, MarionetteHandler::new(settings), vec![]);
start(addr, MarionetteHandler::new(settings), extension_routes());
}

0 comments on commit 4bd5c36

Please sign in to comment.