Bug 941292 - Move charms controller in with flyout code. r=sfoster
Bug 941292 - Add search provider options flyout. r=sfoster