Add Java resources to content and chrome.

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ skipping 22 matching lines @@
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.WeakContext;
-import org.chromium.content.app.AppResource;
 import org.chromium.content.browser.ContentViewGestureHandler.MotionEventDelegate;
 import org.chromium.content.browser.accessibility.AccessibilityInjector;
 import org.chromium.content.common.TraceEvent;
+import org.chromium.content.R;
 import org.chromium.ui.gfx.NativeWindow;
 
 /**
  * Provides a Java-side 'wrapper' around a WebContent (native) instance.
  * Contains all the major functionality necessary to manage the lifecycle of a ContentView without
  * being tied to the view system.
  */
 @JNINamespace("content")
 public class ContentViewCore implements MotionEventDelegate {
     private static final String TAG = ContentViewCore.class.getName();
@@ skipping 220 matching lines @@
     /**
      * Constructs a new ContentViewCore. Embedders must call initialize() after constructing
      * a ContentViewCore and before using it.
      *
      * @param context The context used to create this.
      * @param personality The type of ContentViewCore being created.
      */
     public ContentViewCore(Context context, int personality) {
         mContext = context;
 
-        // All application resources must be registered by the time the content view is created.
-        // This should be omitted in final release builds where assertions are disabled.
-        // TODO(leandrogracia): re-enable this as soon as crbug.com/136704 is fixed.
-        // assert AppResource.verifyResourceRegistration();
-
         WeakContext.initializeWeakContext(context);
         // By default, ContentView will initialize single process mode. The call to
         // initContentViewProcess below is ignored if either the ContentView host called
         // enableMultiProcess() or the platform browser called initChromiumBrowserProcess().
         AndroidBrowserProcess.initContentViewProcess(
                 context, AndroidBrowserProcess.MAX_RENDERERS_SINGLE_PROCESS);
 
         mPersonality = personality;
         HeapStatsLogger.init(mContext.getApplicationContext());
 
@@ skipping 198 matching lines @@
                 this, mNativeContentViewCore, isAccessFromFileURLsGrantedByDefault);
         initializeContainerView(internalDispatcher);
         if (mPersonality == PERSONALITY_VIEW) {
             setAllUserAgentOverridesInHistory();
         }
 
         mAccessibilityInjector = AccessibilityInjector.newInstance(this);
         mAccessibilityInjector.addOrRemoveAccessibilityApisIfNecessary();
 
         String contentDescription = "Web View";
-        if (AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION == 0) {
+        if (R.string.accessibility_content_view == 0) {
             Log.w(TAG, "Setting contentDescription to 'Web View' as no value was specified.");
         } else {
             contentDescription = mContext.getResources().getString(
-                    AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION);
+                    R.string.accessibility_content_view);
         }
         mContainerView.setContentDescription(contentDescription);
         mWebContentsObserver = new WebContentsObserverAndroid(this) {
             @Override
             public void didStartLoading(String url) {
                 hidePopupDialog();
             }
         };
     }
 
@@ skipping 1902 matching lines @@
     private native int nativeGetNavigationHistory(int nativeContentViewCoreImpl, Object context);
 
     private native void nativeUpdateVSyncParameters(int nativeContentViewCoreImpl,
             long timebaseMicros, long intervalMicros);
 
     private native boolean nativePopulateBitmapFromCompositor(int nativeContentViewCoreImpl,
             Bitmap bitmap);
 
     private native void nativeSetSize(int nativeContentViewCoreImpl, int width, int height);
 }