content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java - Issue 14100003: [Android] Moving input related files to a separate input/ directory.

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

Issue 14100003: [Android] Moving input related files to a separate input/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 months 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 | « content/public/android/javatests/src/org/chromium/content/browser/SelectPopupTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

similarity index 98%

rename from content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java

rename to content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

index 76d23e748f0e2317b5d8b112028a0222b9358cb0..a49cddb4c79bbf2c7220381badc17f60db2a2ef8 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.content.browser;

+package org.chromium.content.browser.input;

import android.app.Activity;

import android.content.ClipData;

@@ -20,7 +20,8 @@ import android.view.inputmethod.InputConnection;

import org.chromium.base.ThreadUtils;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.UrlUtils;

-import org.chromium.content.browser.ImeAdapter.AdapterInputConnection;

+import org.chromium.content.browser.ContentView;

+import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.browser.test.util.DOMUtils;

@@ -31,8 +32,6 @@ import java.util.concurrent.Callable;

public class ImeTest extends ContentShellTestBase {

- private static final int INVALID_SELECTION = -2;

- private static final int INVALID_COMPOSITION = -2;

private static final String DATA_URL = UrlUtils.encodeHtmlDataUri(

"<html><head><meta name=\"viewport\"" +

"content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0\" /></head>" +

@@ -406,7 +405,7 @@ public class ImeTest extends ContentShellTestBase {

return getContentViewCore().getImeAdapterForTest();

}

- private ImeAdapter.AdapterInputConnection getAdapterInputConnection() {

+ private AdapterInputConnection getAdapterInputConnection() {

return getContentViewCore().getInputConnectionForTest();

}

@@ -419,7 +418,7 @@ public class ImeTest extends ContentShellTestBase {

}

- private static class TestAdapterInputConnection extends ImeAdapter.AdapterInputConnection {

+ private static class TestAdapterInputConnection extends AdapterInputConnection {

private int mSetEditableTextCallCounter = 0;

private int mUpdateSelectionCounter = 0;

private String mText;