Show highlights when showHighlights option is provided

h/static/scripts/host.coffee

@@ -37,6 +37,11 @@ class Annotator.Host extends Annotator.Guest
     if options.firstRun
       this.on 'panelReady', => this.actuallyShowFrame(transition: false)
 
+    # Host frame dictates the toolbar options.
+    this.on 'panelReady', =>
+      this.setTool('comment')
+      this.setVisibleHighlights(!!options.showHighlights)
+
     if @plugins.Heatmap?
       this._setupDragEvents()
       @plugins.Heatmap.element.on 'click', (event) =>

h/static/scripts/services.coffee

@@ -107,13 +107,15 @@ class Hypothesis extends Annotator
               entities.push href
             this.plugins.Store?.loadAnnotations()
 
-        channel.notify
-          method: 'setTool'
-          params: this.tool
-
-        channel.notify
-          method: 'setVisibleHighlights'
-          params: this.visibleHighlights
+        # Allow the host to define it's own state
+        unless source is $window.parent
+          channel.notify
+            method: 'setTool'
+            params: this.tool
+
+          channel.notify
+            method: 'setVisibleHighlights'
+            params: this.visibleHighlights
 
         @providers.push
           channel: channel