Merge branch 'master' into user-cleanup

Author: jpevarnek

src/chrome/extension/scripts/context.ts

@@ -19,5 +19,4 @@ export var ui :user_interface.UserInterface =
 
 export var model :ui_model.Model = ui.model;
 
-ui.browser = 'chrome';
 console.log('Loaded dependencies for Chrome Extension.');

src/firefox/data/scripts/background.ts

@@ -30,8 +30,6 @@ if (undefined === ui) {
     model = ui.model;
 }
 
-ui.browser = 'firefox';
-
 port.on('newlyInstalled', function() {
   firefoxBrowserApi.hasInstalledThenLoggedIn = false;
 });

src/generic_ui/polymer/settings.html

@@ -198,7 +198,7 @@
 
         <hr>
 
-        <uproxy-link on-tap='{{ restart }}' hidden?='{{ ui.browser !== "chrome" }}' role='button'>
+        <uproxy-link on-tap='{{ restart }}' hidden?='{{ !showRestartButton }}' role='button'>
           <core-icon icon='refresh'></core-icon>
           <span class='label'>{{ "RESTART" | $$ }}</span>
         </uproxy-link>

src/generic_ui/polymer/settings.ts

@@ -13,6 +13,7 @@ import dialogs = require('../scripts/dialogs');
 Polymer({
   accountChooserOpen: false,
   connectedNetworks: '',
+  showRestartButton: false,
   logOut: function() {
     // logout all networks asynchronously
 
@@ -68,6 +69,7 @@ Polymer({
   ready: function() {
     this.ui = ui;
     this.model = ui_context.model;
+    this.showRestartButton = (typeof window.chrome) !== 'undefined';
   },
   observe: {
     'model.onlineNetworks': 'networksChanged'

src/generic_ui/polymer/state.ts

@@ -79,7 +79,7 @@ class Background {
   }
 
   public updateGlobalSettings = (settings: uproxy_core_api.GlobalSettings): void => {
-    this.connector_.sendMessage('update-global-settings', settings);
+    this.doInBackground_('update-global-settings', settings);
   }
 
   public restart = (): void => {

src/generic_ui/scripts/ui.ts

@@ -121,7 +121,6 @@ export class UserInterface implements ui_constants.UiApi {
 
   /* About this uProxy installation */
   public portControlSupport = uproxy_core_api.PortControlSupport.PENDING;
-  public browser :string = '';
   public availableVersion :string = null;
 
   public toastMessage :string = null;