summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/IntentHandler.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-05-09 13:55:59 -0700
committerMichael Kolb <kolby@google.com>2011-05-09 14:54:17 -0700
commit7bcafde2ba532941c1eb8c9022eebd5398aeae2a (patch)
tree7e0d841873fd48d59fb4c11e1a7ac45220d4319c /src/com/android/browser/IntentHandler.java
parent37a0bde01dc9655fc99ee2d63098ab073ac97e33 (diff)
downloadpackages_apps_Browser-7bcafde2ba532941c1eb8c9022eebd5398aeae2a.tar.gz
packages_apps_Browser-7bcafde2ba532941c1eb8c9022eebd5398aeae2a.tar.bz2
packages_apps_Browser-7bcafde2ba532941c1eb8c9022eebd5398aeae2a.zip
refactor open tab code
Change-Id: Ibcffa5a55b2b7dcf56174f9dd916a565b31506e9
Diffstat (limited to 'src/com/android/browser/IntentHandler.java')
-rw-r--r--src/com/android/browser/IntentHandler.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 1322d96d9..40db29fc6 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -134,7 +134,7 @@ public class IntentHandler {
}
if (intent.getBooleanExtra(Browser.EXTRA_CREATE_NEW_TAB, false)) {
- mController.openTabAndShow(mTabControl.getCurrentTab(), urlData, false, null);
+ mController.openTab(urlData);
return;
}
final String appId = intent
@@ -151,7 +151,10 @@ public class IntentHandler {
mController.reuseTab(appTab, appId, urlData);
return;
} else {
- mController.openTabAndShow(null, urlData, false, appId);
+ Tab tab = mController.openTab(urlData);
+ if (tab != null) {
+ tab.setAppId(appId);
+ }
}
} else {
// No matching application tab, try to find a regular tab
@@ -168,7 +171,10 @@ public class IntentHandler {
// MAX_TABS. Then the url will be opened in the current
// tab. If a new tab is created, it will have "true" for
// exit on close.
- mController.openTabAndShow(null, urlData, false, appId);
+ Tab tab = mController.openTab(urlData);
+ if (tab != null) {
+ tab.setAppId(appId);
+ }
}
}
} else {