Bug 1136900 - Make Settings be a sheet accessible from the Tabs Tray.…

… r=bnicholson,darrin

Client/Frontend/Browser/TabTrayController.swift

@@ -129,11 +129,10 @@ class TabTrayController: UIViewController, UITabBarDelegate, UITableViewDelegate
         toolbar.backgroundColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0)
         view.addSubview(toolbar)
 
+        let settingsItem = UIBarButtonItem(title: "\u{2699}", style: .Plain, target: self, action: "SELdidClickSettingsItem")
         let signinItem = UIBarButtonItem(title: "Sign in", style: .Plain, target: self, action: "SELdidClickDone")
         signinItem.enabled = false
         let addTabItem = UIBarButtonItem(barButtonSystemItem: .Add, target: self, action: "SELdidClickAddTab")
-        let settingsItem = UIBarButtonItem(image: UIImage(named: "nav-settings-off.png"), style: .Plain, target: self, action: "SELdidClickSettingsItem")
-        settingsItem.enabled = false
         let spacer = UIBarButtonItem(barButtonSystemItem: .FlexibleSpace, target: nil, action: nil)
         toolbar.setItems([settingsItem, spacer, signinItem, spacer, addTabItem], animated: true)
 
@@ -162,7 +161,7 @@ class TabTrayController: UIViewController, UITabBarDelegate, UITableViewDelegate
     }
 
     func SELdidClickSettingsItem() {
-        let controller = SettingsPanel(nibName: "SettingsPanel", bundle: nil)
+        let controller = SettingsNavigationController()
         controller.profile = profile
         presentViewController(controller, animated: true, completion: nil)
     }

Client/Frontend/Home/Panels.swift

@@ -47,11 +47,6 @@ private var Controllers: Protector<[ToolbarItem]> = Protector(name: "Controllers
         controller.profile = profile
         return controller
     }, enabled: true),
-    ToolbarItem(title: "Settings", imageName: "settings",  generator: { (profile: Profile) -> UIViewController in
-        let controller = SettingsPanel(nibName: nil, bundle: nil)
-        controller.profile = profile
-        return controller
-    }, enabled: true),
 ])
 
 private var setup: Bool = false // True if we've already loaded the order/enabled prefs once and the Controllers array has been updated