Refactor Observatory

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

Index: runtime/bin/vmservice/client/lib/src/elements/field_view.html
diff --git a/runtime/bin/vmservice/client/lib/src/observatory_elements/field_view.html b/runtime/bin/vmservice/client/lib/src/elements/field_view.html
similarity index 80%
rename from runtime/bin/vmservice/client/lib/src/observatory_elements/field_view.html
rename to runtime/bin/vmservice/client/lib/src/elements/field_view.html
index 1925dcb6c2aace00ecc34fe50c635ebb1534c87b..1c591ca1f63f76b49e1994f78676a8eaeac65ab9 100644
--- a/runtime/bin/vmservice/client/lib/src/observatory_elements/field_view.html
+++ b/runtime/bin/vmservice/client/lib/src/elements/field_view.html
@@ -3,18 +3,17 @@
   <link rel="import" href="nav_bar.html">
   <link rel="import" href="observatory_element.html">
 </head>
-<polymer-element name="field-view" extends="observatory-element">
+<polymer-element name="field-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>
       <template if="{{ field['owner']['type'] == '@Class' }}">
         <!-- TODO(turnidge): Add library nav menu here. -->
-        <class-nav-menu app="{{ app }}" cls="{{ field['owner'] }}"></class-nav-menu>
+        <class-nav-menu isolate="{{ isolate }}" cls="{{ field['owner'] }}"></class-nav-menu>
       </template>
       <template if="{{ field['owner']['type'] == '@Library' }}">
-        <library-nav-menu app="{{ app }}" library="{{ field['owner'] }}"></library-nav-menu>
+        <library-nav-menu isolate="{{ isolate }}" library="{{ field['owner'] }}"></library-nav-menu>
       </template>
       <nav-menu link="." anchor="{{ field['user_name'] }}" last="{{ true }}"></nav-menu>
       <nav-refresh callback="{{ refresh }}"></nav-refresh>
@@ -28,7 +27,7 @@
           <template if="{{ field['final'] }}">final</template>
           <template if="{{ field['const'] }}">const</template>
           {{ field['user_name'] }} ({{ field['name'] }})
-          <class-ref app="{{ app }}" ref="{{ field['class'] }}"></class-ref>
+          <class-ref isolate="{{ isolate }}" ref="{{ field['class'] }}"></class-ref>
         </div>
         <div class="panel-body">
         <template if="{{ field['guard_class'] == 'dynamic'}}">
@@ -47,7 +46,7 @@
             </div>
           </template>
           <blockquote>
-            <class-ref app="{{ app }}" ref="{{ field['guard_class'] }}"></class-ref>
+            <class-ref isolate="{{ isolate }}" ref="{{ field['guard_class'] }}"></class-ref>
           </blockquote>
         </template>
         </div>