Refactor Observatory

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

Index: runtime/bin/vmservice/client/lib/src/elements/message_viewer.html
diff --git a/runtime/bin/vmservice/client/lib/src/observatory_elements/message_viewer.html b/runtime/bin/vmservice/client/lib/src/elements/message_viewer.html
similarity index 57%
rename from runtime/bin/vmservice/client/lib/src/observatory_elements/message_viewer.html
rename to runtime/bin/vmservice/client/lib/src/elements/message_viewer.html
index 581abf8c4265b018f22474ff959c3a4b3f19bbe2..a00b2ff214b129d8a2a214213480a58fc785d7e5 100644
--- a/runtime/bin/vmservice/client/lib/src/observatory_elements/message_viewer.html
+++ b/runtime/bin/vmservice/client/lib/src/elements/message_viewer.html
@@ -8,7 +8,7 @@
   <link rel="import" href="heap_profile.html">
   <link rel="import" href="instance_view.html">
   <link rel="import" href="isolate_list.html">
-  <link rel="import" href="json_view.html">
+  <link rel="import" href="isolate_profile.html">
   <link rel="import" href="library_view.html">
   <link rel="import" href="observatory_element.html">
   <link rel="import" href="script_view.html">
@@ -22,62 +22,62 @@
   <template>
   	<!-- If the message type is an IsolateList -->
     <template if="{{ messageType == 'IsolateList' }}">
-      <isolate-list app="{{ app }}"></isolate-list>
+      <isolate-list vm="{{ app.vm }}"></isolate-list>
     </template>
     <!-- If the message type is a StackTrace -->
     <template if="{{ messageType == 'StackTrace' }}">
-      <stack-trace app="{{ app }}" trace="{{ message }}"></stack-trace>
+      <stack-trace isolate="{{ app.isolate }}" trace="{{ message }}"></stack-trace>
     </template>
     <template if="{{ messageType == 'BreakpointList' }}">
-      <breakpoint-list app="{{ app }}" msg="{{ message }}"></breakpoint-list>
+      <breakpoint-list isolate="{{ app.isolate }}" msg="{{ message }}"></breakpoint-list>
     </template>
     <template if="{{ messageType == 'Error' }}">
-      <error-view app="{{ app }}" error="{{ message }}"></error-view>
+      <error-view isolate="{{ app.isolate }}" error="{{ message }}"></error-view>
     </template>
     <template if="{{ messageType == 'Library' }}">
-      <library-view app="{{ app }}" library="{{ message }}"></library-view>
+      <library-view isolate="{{ app.isolate }}" library="{{ message }}"></library-view>
     </template>
     <template if="{{ messageType == 'Class' }}">
-      <class-view app="{{ app }}" cls="{{ message }}"></class-view>
+      <class-view isolate="{{ app.isolate }}" cls="{{ message }}"></class-view>
     </template>
     <template if="{{ messageType == 'Field' }}">
-      <field-view app="{{ app }}" field="{{ message }}"></field-view>
+      <field-view isolate="{{ app.isolate }}" field="{{ message }}"></field-view>
     </template>
     <template if="{{ messageType == 'Closure' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'Instance' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'Array' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'GrowableObjectArray' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'String' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'Bool' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'Smi' }}">
-      <instance-view app="{{ app }}" instance="{{ message }}"></instance-view>
+      <instance-view isolate="{{ app.isolate }}" instance="{{ message }}"></instance-view>
     </template>
     <template if="{{ messageType == 'Function' }}">
-      <function-view app="{{ app }}" function="{{ message }}"></function-view>
+      <function-view isolate="{{ app.isolate }}" function="{{ message }}"></function-view>
     </template>
     <template if="{{ messageType == 'Code' }}">
-      <code-view app="{{ app }}" code="{{ message['code'] }}"></code-view>
+      <code-view isolate="{{ app.isolate }}" code="{{ message['code'] }}"></code-view>
     </template>
     <template if="{{ messageType == 'Script' }}">
-      <script-view app="{{ app }}" script="{{ message['script'] }}"></script-view>
+      <script-view isolate="{{ app.isolate }}" script="{{ message['script'] }}"></script-view>
     </template>
     <template if="{{ messageType == 'AllocationProfile' }}">
-      <heap-profile app="{{ app }}" profile="{{ message }}"></heap-profile>
+      <heap-profile isolate="{{ app.isolate }}" profile="{{ message }}"></heap-profile>
     </template>
-    <template if="{{ messageType == 'CPU' }}">
-      <json-view json="{{ message }}"></json-view>
+    <template if="{{ messageType == 'Profile' }}">
+      <isolate-profile isolate="{{ app.isolate }}" profile="{{ message }}"></isolate-profile>
     </template>
     <!-- Add new views and message types in the future here. -->
   </template>