summaryrefslogtreecommitdiff
path: root/platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-08-19 22:27:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-19 21:25:05 +0000
commit4ca751c002784c4bfd349cc5240b045b62277c80 (patch)
treedfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java
parent890d9a2952301682ffecaed4495f5f65c84c3642 (diff)
parent060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff)
downloadidea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java')
-rw-r--r--platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java b/platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java
index 826ca80cd21a..b7fd90ef3ade 100644
--- a/platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java
+++ b/platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java
@@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
public abstract class BrowserSpecificSettings implements Cloneable {
@NotNull
@@ -30,6 +31,11 @@ public abstract class BrowserSpecificSettings implements Cloneable {
return Collections.emptyList();
}
+ @NotNull
+ public Map<String, String> getEnvironmentVariables() {
+ return Collections.emptyMap();
+ }
+
@Override
public BrowserSpecificSettings clone() {
try {