Refactor Observatory

runtime/bin/vmservice/client/lib/src/elements/instance_view.html

Index: runtime/bin/vmservice/client/lib/src/elements/instance_view.html
diff --git a/runtime/bin/vmservice/client/lib/src/observatory_elements/instance_view.html b/runtime/bin/vmservice/client/lib/src/elements/instance_view.html
similarity index 72%
rename from runtime/bin/vmservice/client/lib/src/observatory_elements/instance_view.html
rename to runtime/bin/vmservice/client/lib/src/elements/instance_view.html
index 7230481109e40a347ebc1891f1bd21c077c05c8b..813b4ad5674634869ade5473d1e3603010caf58a 100644
--- a/runtime/bin/vmservice/client/lib/src/observatory_elements/instance_view.html
+++ b/runtime/bin/vmservice/client/lib/src/elements/instance_view.html
@@ -3,17 +3,16 @@
   <link rel="import" href="error_view.html">
   <link rel="import" href="field_ref.html">
   <link rel="import" href="instance_ref.html">
+  <link rel="import" href="isolate_element.html">
   <link rel="import" href="nav_bar.html">
-  <link rel="import" href="observatory_element.html">
 </head>
-<polymer-element name="instance-view" extends="observatory-element">
+<polymer-element name="instance-view" extends="isolate-element">
   <template>
     <nav-bar>
       <top-nav-menu></top-nav-menu>
-      <isolate-nav-menu app="{{ app }}" isolate="{{ app.locationManager.currentIsolate() }}">
-      </isolate-nav-menu>
+      <isolate-nav-menu isolate="{{ isolate }}"></isolate-nav-menu>
       <!-- TODO(turnidge): Add library nav menu here. -->
-      <class-nav-menu app="{{ app }}" cls="{{ instance['class'] }}"></class-nav-menu>
+      <class-nav-menu isolate="{{ isolate }}" cls="{{ instance['class'] }}"></class-nav-menu>
       <nav-menu link="." anchor="instance" last="{{ true }}"></nav-menu>
       <!-- TODO(turnidge): Add nav refresh here. -->
     </nav-bar>
@@ -23,7 +22,7 @@
       <div class="panel panel-warning">
         <div class="panel-heading">
          Instance of
-         <class-ref app="{{ app }}" ref="{{ instance['class'] }}"></class-ref>
+         <class-ref isolate="{{ isolate }}" ref="{{ instance['class'] }}"></class-ref>
         </div>
         <div class="panel-body">
           <template if="{{ instance['error'] == null }}">
@@ -38,8 +37,8 @@
             <table class="table table-hover">
              <tbody>
                 <tr template repeat="{{ field in instance['fields'] }}">
-                  <td><field-ref app="{{ app }}" ref="{{ field['decl'] }}"></field-ref></td>
-                  <td><instance-ref app="{{ app }}" ref="{{ field['value'] }}"></instance-ref></td>
+                  <td><field-ref isolate="{{ isolate }}" ref="{{ field['decl'] }}"></field-ref></td>
+                  <td><instance-ref isolate="{{ isolate }}" ref="{{ field['value'] }}"></instance-ref></td>
                 </tr>
               </tbody>
             </table>