diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 17:22:50 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 17:22:50 +0000 |
| commit | 5b07e8849445819a1d960d17d2a90512b370c0e0 (patch) | |
| tree | 6fb79e9ce6f89405f60d3f8d220867df8276b6c5 /content/shell | |
| parent | 172b8f316daa5dc83868f86f8a8f3b06d0cd690f (diff) | |
| download | chromium_src-5b07e8849445819a1d960d17d2a90512b370c0e0.zip chromium_src-5b07e8849445819a1d960d17d2a90512b370c0e0.tar.gz chromium_src-5b07e8849445819a1d960d17d2a90512b370c0e0.tar.bz2 | |
Using ActivityWindowAndroid instead of WindowAndroid.
This will fix fyi bot.
TBR=yfriedman
Review URL: https://codereview.chromium.org/58953009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
2 files changed, 4 insertions, 2 deletions
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java index d7aeecf..b730a11 100644 --- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java +++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java @@ -16,6 +16,7 @@ import org.chromium.content.app.LibraryLoader; import org.chromium.content.browser.BrowserStartupController; import org.chromium.content.common.ProcessInitException; import org.chromium.content_shell.ShellManager; +import org.chromium.ui.ActivityWindowAndroid; import org.chromium.ui.WindowAndroid; @JNINamespace("content") @@ -40,7 +41,7 @@ public class ContentBrowserTestsActivity extends Activity { (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); View view = inflater.inflate(R.layout.test_activity, null); mShellManager = (ShellManager) view.findViewById(R.id.shell_container); - mWindowAndroid = new WindowAndroid(this); + mWindowAndroid = new ActivityWindowAndroid(this); mShellManager.setWindow(mWindowAndroid); Log.i(TAG, "Running tests"); diff --git a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java index 3d605c0..87dfcb8 100644 --- a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java +++ b/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java @@ -21,6 +21,7 @@ import org.chromium.content.common.CommandLine; import org.chromium.content.common.ProcessInitException; import org.chromium.content_shell.Shell; import org.chromium.content_shell.ShellManager; +import org.chromium.ui.ActivityWindowAndroid; import org.chromium.ui.WindowAndroid; public class ContentLinkerTestActivity extends Activity { @@ -94,7 +95,7 @@ public class ContentLinkerTestActivity extends Activity { (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); View view = inflater.inflate(R.layout.test_activity, null); mShellManager = (ShellManager) view.findViewById(R.id.shell_container); - mWindowAndroid = new WindowAndroid(this); + mWindowAndroid = new ActivityWindowAndroid(this); mShellManager.setWindow(mWindowAndroid); mShellManager.setStartupUrl("about:blank"); |