chrome-dev-tools-patches/terminate-patch.txt
author Eugene Ostroukhov <eugeneo@symbian.org>
Mon, 27 Sep 2010 11:43:44 -0700
changeset 490 17d65127bce4
parent 314 dfd37533036c
permissions -rw-r--r--
Bug 3735 - info.plist validation regression
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
314
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     1
diff -r 42f09aa2b24a org.chromium.debug.core/src/org/chromium/debug/core/model/DebugTargetImpl.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     2
--- a/org.chromium.debug.core/src/org/chromium/debug/core/model/DebugTargetImpl.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     3
+++ b/org.chromium.debug.core/src/org/chromium/debug/core/model/DebugTargetImpl.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     4
@@ -187,7 +187,17 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     5
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     6
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     7
   public void terminate() throws DebugException {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     8
-    disconnect();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     9
+    if (workspaceBridgeFactory.canCloseTab()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    10
+      closeTab();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    11
+    } else {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    12
+      disconnect();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    13
+    }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    14
+  }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    15
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    16
+  private void closeTab() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    17
+    if (!vmEmbedder.getJavascriptVm().close()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    18
+      ChromiumDebugPlugin.logWarning(Messages.DebugTargetImpl_BadResultWhileDisconnecting);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    19
+    }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    20
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    21
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    22
   public boolean canResume() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    23
diff -r 42f09aa2b24a org.chromium.debug.core/src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    24
--- a/org.chromium.debug.core/src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    25
+++ b/org.chromium.debug.core/src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    26
@@ -56,6 +56,10 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    27
     public JsLabelProvider getLabelProvider() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    28
       return LABEL_PROVIDER;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    29
     }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    30
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    31
+    public boolean canCloseTab() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    32
+      return false;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    33
+    }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    34
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    35
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    36
   private final IProject debugProject;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    37
diff -r 42f09aa2b24a org.chromium.debug.core/src/org/chromium/debug/core/model/WorkspaceBridge.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    38
--- a/org.chromium.debug.core/src/org/chromium/debug/core/model/WorkspaceBridge.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    39
+++ b/org.chromium.debug.core/src/org/chromium/debug/core/model/WorkspaceBridge.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    40
@@ -46,6 +46,11 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    41
      * User may cache value of this method.
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    42
      */
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    43
     JsLabelProvider getLabelProvider();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    44
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    45
+    /**
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    46
+     * Returns <code>true</code> if debugger is allowed to close tab. 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    47
+     */
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    48
+    boolean canCloseTab();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    49
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    50
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    51
   /**
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    52
@@ -100,6 +105,7 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    53
     void breakpointsHit(Collection<? extends Breakpoint> breakpointsHit);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    54
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    55
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    56
+  
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    57
   /**
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    58
    * Label provider for several debug elements. This object should be stateless.
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    59
    */
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    60
diff -r 42f09aa2b24a org.chromium.sdk/src/logging.properties
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    61
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    62
+++ b/org.chromium.sdk/src/logging.properties	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    63
@@ -0,0 +1,2 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    64
+.level=WARNING
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    65
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    66
diff -r 42f09aa2b24a org.chromium.sdk/src/org/chromium/sdk/JavascriptVm.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    67
--- a/org.chromium.sdk/src/org/chromium/sdk/JavascriptVm.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    68
+++ b/org.chromium.sdk/src/org/chromium/sdk/JavascriptVm.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    69
@@ -58,6 +58,13 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    70
   boolean detach();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    71
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    72
   /**
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    73
+   * Closes associated tab
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    74
+   *
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    75
+   * @return whether the operation succeeded
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    76
+   */
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    77
+  boolean close();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    78
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    79
+  /**
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    80
    * @return whether the tab is currently attached
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    81
    */
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    82
   boolean isAttached();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    83
diff -r 42f09aa2b24a org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    84
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    85
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    86
@@ -107,6 +107,11 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    87
     return Result.OK == result;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    88
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    89
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    90
+  public boolean close() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    91
+      Result result = devToolSessionManager.closeTab();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    92
+      return Result.OK == result;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    93
+  }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    94
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    95
   public boolean isAttached() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    96
     return devToolSessionManager.isAttachedForUi();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    97
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    98
diff -r 42f09aa2b24a org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    99
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   100
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   101
@@ -149,6 +149,10 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   102
     connection.close();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   103
     return true;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   104
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   105
+  
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   106
+  public boolean close() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   107
+    return detach();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   108
+  }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   109
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   110
   public boolean isAttached() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   111
     return connectionState == ConnectionState.CONNECTED;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   112
diff -r 42f09aa2b24a org.chromium.sdk/src/org/chromium/sdk/internal/tools/v8/ChromeDevToolSessionManager.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   113
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/tools/v8/ChromeDevToolSessionManager.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   114
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/tools/v8/ChromeDevToolSessionManager.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   115
@@ -161,6 +161,7 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   116
           processAttach(json);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   117
           break;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   118
         case DETACH:
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   119
+        case TERMINATE:
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   120
           processDetach(json);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   121
           break;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   122
         case DEBUGGER_COMMAND:
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   123
@@ -172,6 +173,9 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   124
         case CLOSED:
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   125
           processClosed(json);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   126
           break;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   127
+        default:
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   128
+          System.out.println(message.getContent());
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   129
+          return;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   130
       }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   131
       return;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   132
     }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   133
@@ -264,6 +268,30 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   134
     return result;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   135
   }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   136
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   137
+  /**
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   138
+   * Closes associated browser tab.
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   139
+   * @return terminate request result
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   140
+   */
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   141
+  public Result closeTab() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   142
+      if (attachState.get() != AttachState.NORMAL) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   143
+          toolHandler.onDebuggerDetached();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   144
+          return Result.ILLEGAL_TAB_STATE;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   145
+      }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   146
+      
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   147
+      String command = V8DebuggerToolMessageFactory.terminate();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   148
+      Result result;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   149
+      try {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   150
+          result = sendSimpleCommandSync(detachCallback, command);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   151
+      } catch (AttachmentFailureException e) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   152
+          result = null;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   153
+      } finally {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   154
+          // Make sure line is cut
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   155
+          cutTheLineMyself();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   156
+      }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   157
+      
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   158
+      return result;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   159
+  }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   160
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   161
   private Result sendSimpleCommandSync(AtomicReference<ResultAwareCallback> callbackReference,
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   162
       String command) throws AttachmentFailureException {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   163
     final Semaphore sem = new Semaphore(0);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   164
@@ -448,6 +476,10 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   165
       return createDebuggerMessage(DebuggerToolCommand.DETACH, null);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   166
     }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   167
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   168
+    static String terminate() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   169
+        return createDebuggerMessage(DebuggerToolCommand.TERMINATE, null);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   170
+    }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   171
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   172
     public static String debuggerCommand(String json) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   173
       return createDebuggerMessage(DebuggerToolCommand.DEBUGGER_COMMAND, json);
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   174
     }
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   175
diff -r 42f09aa2b24a org.chromium.sdk/src/org/chromium/sdk/internal/tools/v8/DebuggerToolCommand.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   176
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/tools/v8/DebuggerToolCommand.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   177
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/tools/v8/DebuggerToolCommand.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   178
@@ -13,6 +13,8 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   179
 public enum DebuggerToolCommand {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   180
   ATTACH("attach"),
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   181
   DETACH("detach"),
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   182
+  TERMINATE("terminate"),
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   183
+  DISPATCH("dispatch"),
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   184
   DEBUGGER_COMMAND("debugger_command"),
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   185
   EVALUATE_JAVASCRIPT("evaluate_javascript"),
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   186
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   187
diff -r 42f09aa2b24a org.symbian.tools.wrttools.debug.core/my.txt
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   188
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   189
+++ b/org.symbian.tools.wrttools.debug.core/my.txt	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   190
@@ -0,0 +1,8 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   191
+This is a patch to close tab on debugger request. I also have a patch for Chrome
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   192
+Developer Tools that I will submit later.
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   193
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   194
+Is there any documentation on Chrome APIs? I really doubt I used correct one to 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   195
+close the tab.
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   196
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   197
+This is my first attempt to submit patch to Chromium so I would be greateful for
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   198
+any feedback.
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   199
\ No newline at end of file
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   200
diff -r 42f09aa2b24a org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/ChromeDebugUtils.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   201
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/ChromeDebugUtils.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   202
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/ChromeDebugUtils.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   203
@@ -30,10 +30,25 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   204
 			if (chromeExecutable.isFile()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   205
 				return chromeExecutable.getAbsolutePath();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   206
 			}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   207
+			chromeExecutable = new File(file, getChromiumExecutable());
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   208
+			if (chromeExecutable.isFile()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   209
+				return chromeExecutable.getAbsolutePath();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   210
+			}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   211
 		}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   212
 		return null;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   213
 	}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   214
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   215
+	private static String getChromiumExecutable() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   216
+		// Add more ifs as we add support for new platforms
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   217
+		if (CoreUtil.isMac()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   218
+			return "Chromium.app/Contents/MacOS/Chromium";
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   219
+		} else if (CoreUtil.isLinux()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   220
+			return "chromium";
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   221
+		} else {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   222
+			return "chromium.exe";
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   223
+		}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   224
+	}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   225
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   226
 	private static String getExecutable() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   227
 		// Add more ifs as we add support for new platforms
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   228
 		if (CoreUtil.isMac()) {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   229
diff -r 42f09aa2b24a org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/ChromeInstancesManager.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   230
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/ChromeInstancesManager.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   231
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/ChromeInstancesManager.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   232
@@ -44,7 +44,8 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   233
             "--disable-extenions", // Use standard UI, should also improve speed and stability
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   234
             "--disable-plugins", // Run faster!
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   235
             "--activate-on-launch", // Bring to front on Mac
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   236
-            "--always-enable-dev-tools", "--no-default-browser-check", // Our users don't need this nagging
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   237
+            "--exit-on-no-windows", // Bring to front on Mac
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   238
+            "--no-default-browser-check", // Our users don't need this nagging
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   239
             "--no-first-run", // We don't care
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   240
             "--app=%s" // Here we will have widget URI as --app argument
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   241
     };
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   242
diff -r 42f09aa2b24a org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WRTProjectWorkspaceBridge.java
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   243
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WRTProjectWorkspaceBridge.java	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   244
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WRTProjectWorkspaceBridge.java	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   245
@@ -49,6 +49,10 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   246
 			return new WrtLabelProvider();
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   247
 		}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   248
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   249
+		public boolean canCloseTab() {
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   250
+			return true;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   251
+		}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   252
+
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   253
 	}
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   254
 
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   255
 //	public final static String DEBUG_MODEL_ID = VProjectWorkspaceBridge.DEBUG_MODEL_ID;
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   256
diff -r 42f09aa2b24a org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   257
--- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch	Mon Apr 19 15:00:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   258
+++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch	Wed Apr 21 09:29:57 2010 -0700
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   259
@@ -1,4 +1,4 @@
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   260
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   261
+<?xml version="1.0" encoding="UTF-8"?>
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   262
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   263
 <booleanAttribute key="append.args" value="true"/>
dfd37533036c Backup copy of the experimental changes to Chromium developer tools
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
   264
 <booleanAttribute key="askclear" value="true"/>