diff options
| author | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-10 23:08:02 +0000 |
|---|---|---|
| committer | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-10 23:08:02 +0000 |
| commit | fe38683f3a0be35f661fe44e2de924fb4c58cb36 (patch) | |
| tree | 2081be7c7ad95550b6437a1cdfb802e6fccd412e /content/shell/android | |
| parent | 6ef7d977875b6eb426960adc531cebd2557faf5d (diff) | |
| download | chromium_src-fe38683f3a0be35f661fe44e2de924fb4c58cb36.zip chromium_src-fe38683f3a0be35f661fe44e2de924fb4c58cb36.tar.gz chromium_src-fe38683f3a0be35f661fe44e2de924fb4c58cb36.tar.bz2 | |
Add PopupZoomer view to hierarchy only when necessary.
BUG=164983
Review URL: https://chromiumcodereview.appspot.com/11506009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/android')
| -rw-r--r-- | content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java index 68d7b8f3..0b5c971 100644 --- a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java +++ b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java @@ -63,9 +63,9 @@ public class ContentShellTestBase extends ActivityInstrumentationTestCase2<Conte * loading pages. Instead it should be used more for test initialization. The proper way * to wait is to use a TestCallbackHelperContainer after the initial load is completed. * @return Whether or not the Shell was actually finished loading. - * @throws Exception + * @throws InterruptedException */ - protected boolean waitForActiveShellToBeDoneLoading() throws Exception { + protected boolean waitForActiveShellToBeDoneLoading() throws InterruptedException { final ContentShellActivity activity = getActivity(); // Wait for the Content Shell to be initialized. |