Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1047)

Unified Diff: chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java

Issue 11377011: Fix adb_run_content_shell to correctly pass URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
index f072a6d06f2fd0067adf361017126c84059014ee..649b40f46f185774f7f7c60fa4e66c8fda0499d1 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
@@ -35,6 +35,8 @@ public class TabManager extends LinearLayout {
private TabBase mCurrentTab;
+ private String mStartupUrl = DEFAULT_URL;
+
/**
* @param context The Context the view is running in.
* @param attrs The attributes of the XML tag that is inflating the view.
@@ -61,7 +63,7 @@ public class TabManager extends LinearLayout {
public void surfaceCreated(SurfaceHolder holder) {
nativeSurfaceCreated(holder.getSurface());
- if (mCurrentTab == null) createTab(DEFAULT_URL);
+ if (mCurrentTab == null) createTab(mStartupUrl);
}
@Override
@@ -79,6 +81,13 @@ public class TabManager extends LinearLayout {
}
/**
+ * @param startupUrl The URL that the first tab should navigate to.
+ */
+ public void setStartupUrl(String startupUrl) {
+ mStartupUrl = startupUrl;
+ }
+
+ /**
* @return The currently visible {@link TabBase}.
*/
public TabBase getCurrentTab() {
« no previous file with comments | « chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698