Add Java resources to content and chrome.

This adds Java resources directly to the content and chrome folders and starts
accessing them through the Java classes org.chromium.content.R and
org.chromium.chrome.R instead of using AppResource.

A following CL will remove these resources from ContentShell and other build
targets that currently provide duplicates of these resources.  The following CL
will also remove remaining references to AppResource.

This is the second of three CLs to replace AppResource with R:
1. http://codereview.chromium.org/11363150 - Support Java resources within content
2. http://codereview.chromium.org/11360207 - Add Java resources to content and chrome
3. http://codereview.chromium.org/11377117 - Remove AppResource and unneeded resources

BUG=136704

Review URL: https://chromiumcodereview.appspot.com/11360207

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168759 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 234 insertions, 74 deletions

diff --git a/content/public/android/java/res/layout-land/date_time_picker_dialog.xml b/content/public/android/java/res/layout-land/date_time_picker_dialog.xml
new file mode 100644
index 0000000..d44ab7a
--- /dev/null
+++ b/content/public/android/java/res/layout-land/date_time_picker_dialog.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+    <DatePicker
+        android:id="@+id/date_picker"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:spinnersShown="true"
+        android:calendarViewShown="false"
+        android:contentDescription="@string/accessibility_datetime_picker_date"
+        />
+
+    <TimePicker
+        android:id="@+id/time_picker"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/accessibility_datetime_picker_time"
+        />
+
+</LinearLayout>
diff --git a/content/public/android/java/res/layout/date_time_picker_dialog.xml b/content/public/android/java/res/layout/date_time_picker_dialog.xml
new file mode 100644
index 0000000..ddc0c5e
--- /dev/null
+++ b/content/public/android/java/res/layout/date_time_picker_dialog.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <DatePicker
+        android:id="@+id/date_picker"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:spinnersShown="true"
+        android:calendarViewShown="false"
+        android:contentDescription="@string/accessibility_datetime_picker_date"
+        />
+
+    <TimePicker
+        android:id="@+id/time_picker"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/accessibility_datetime_picker_time"
+        />
+
+</LinearLayout>
diff --git a/content/public/android/java/res/layout/month_picker.xml b/content/public/android/java/res/layout/month_picker.xml
new file mode 100644
index 0000000..92f0629
--- /dev/null
+++ b/content/public/android/java/res/layout/month_picker.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+    <LinearLayout android:id="@+id/pickers"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:gravity="center">
+
+        <!-- Month -->
+        <NumberPicker
+            android:id="@+id/month"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dip"
+            android:layout_marginRight="16dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:contentDescription="@string/accessibility_date_picker_month"
+            />
+
+        <!-- Year -->
+        <NumberPicker
+            android:id="@+id/year"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dip"
+            android:layout_marginRight="16dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:contentDescription="@string/accessibility_date_picker_year"
+            />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/content/public/android/java/res/layout/month_picker_dialog.xml b/content/public/android/java/res/layout/month_picker_dialog.xml
new file mode 100644
index 0000000..70ab1df
--- /dev/null
+++ b/content/public/android/java/res/layout/month_picker_dialog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<org.chromium.content.browser.MonthPicker xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/date_picker"
+    android:layout_gravity="center_horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    />
diff --git a/content/public/android/java/res/values/dimens.xml b/content/public/android/java/res/values/dimens.xml
new file mode 100644
index 0000000..25ee103
--- /dev/null
+++ b/content/public/android/java/res/values/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources>
+    <!-- Link Preview dimensions -->
+    <dimen name="link_preview_overlay_radius">7dp</dimen>
+</resources>
diff --git a/content/public/android/java/res/values/official-command-line.xml b/content/public/android/java/res/values/official-command-line.xml
new file mode 100644
index 0000000..4589501
--- /dev/null
+++ b/content/public/android/java/res/values/official-command-line.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources>
+  <string-array name="official_command_line">
+  <!-- Note: this value will be overridden by the identically named resource (if
+       one exists) in the apk that is being built. -->
+  <!-- Format: double-dashed command-line flags within <item></item> blocks. -->
+  </string-array>
+</resources>
diff --git a/content/public/android/java/res/values/strings.xml b/content/public/android/java/res/values/strings.xml
index 53c47d1..caf26b7 100644
--- a/content/public/android/java/res/values/strings.xml
+++ b/content/public/android/java/res/values/strings.xml
@@ -5,5 +5,46 @@
      found in the LICENSE file.
 -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Contextual action bar item for sharing a block of text via email, or
+         other method. [CHAR-LIMIT=24] -->
+    <string name="actionbar_share">Share</string>
+    <!-- Contextual action bar item for using the selected text in a internet
+         search. [CHAR-LIMIT=24] -->
+    <string name="actionbar_web_search">Web search</string>
+
+    <!-- Content description for the content view that holds the web contents [CHAR-LIMIT=32] -->
+    <string name="accessibility_content_view">Web View</string>
+
+    <!-- Date/time picker dialog strings -->
+    <!-- Label for 'set' button in date picker dialog, used to replace the contents of a field with the chosen date [CHAR-LIMIT=12] -->
+    <string name="date_picker_dialog_set">Set</string>
+    <!-- Label for 'clear' button in date picker dialog, used to replace the contents of a field with the empty string [CHAR-LIMIT=12] -->
+    <string name="date_picker_dialog_clear">Clear</string>
+    <!-- Title for the date/time picker dialog, which can be used to choose a date and time. [CHAR-LIMIT=32] -->
+    <string name="date_time_picker_dialog_title">Set date and time</string>
+    <!-- Title for the month picker dialog, which can be used to choose a month. [CHAR-LIMIT=32] -->
+    <string name="month_picker_dialog_title">Set month</string>
+    <!-- Content description for the date time picker date component. [CHAR-LIMIT=32] -->
+    <string name="accessibility_datetime_picker_date">Date</string>
+    <!-- Content description for the date time picker time component. [CHAR-LIMIT=32] -->
+    <string name="accessibility_datetime_picker_time">Time</string>
+    <!-- Content description for the date time picker month component. [CHAR-LIMIT=32] -->
+    <string name="accessibility_date_picker_month">Month</string>
+    <!-- Content description for the date time picker year component. [CHAR-LIMIT=32] -->
+    <string name="accessibility_date_picker_year">Year</string>
+
+    <!-- Media player -->
+    <!-- NO DESCRIPTION [CHAR-LIMIT=32] -->
+    <string name="media_player_error_title">Cannot play video</string>
+    <!-- NO DESCRIPTION [CHAR-LIMIT=100] -->
+    <string name="media_player_error_text_invalid_progressive_playback">
+      Sorry, this video is not valid for streaming to this device.</string>
+    <!-- NO DESCRIPTION [CHAR-LIMIT=100] -->
+    <string name="media_player_error_text_unknown">
+      Sorry, this video cannot be played.</string>
+    <!-- NO DESCRIPTION [CHAR-LIMIT=16] -->
+    <string name="media_player_error_button">OK</string>
+    <!-- NO DESCRIPTION [CHAR-LIMIT=16] -->
+    <string name="media_player_loading_video">Loading video</string>
 </resources>
diff --git a/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java b/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
index d98ad19..6f62a71 100644
--- a/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
+++ b/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
@@ -13,10 +13,10 @@ import android.view.WindowManager;
 import android.view.Display;
 
 import org.chromium.base.JNINamespace;
-import org.chromium.content.app.AppResource;
 import org.chromium.content.app.ContentMain;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.common.CommandLine;
+import org.chromium.content.R;
 
 // NOTE: This file hasn't been fully upstreamed, please don't merge to downstream.
 @JNINamespace("content")
@@ -118,7 +118,7 @@ public class AndroidBrowserProcess {
                     CommandLine.getInstance().hasSwitch(CommandLine.ADD_OFFICIAL_COMMAND_LINE)) {
                 Resources res = context.getResources();
                 try {
-                    String[] switches = res.getStringArray(AppResource.ARRAY_OFFICIAL_COMMAND_LINE);
+                    String[] switches = res.getStringArray(R.array.official_command_line);
                     CommandLine.getInstance().appendSwitchesAndArguments(switches);
                 } catch (Resources.NotFoundException e) {
                     // Do nothing.  It is fine to have no command line
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
index 665b401..b5f67ea 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
@@ -33,8 +33,8 @@ import java.lang.ref.WeakReference;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.content.app.AppResource;
 import org.chromium.content.common.ISandboxedProcessService;
+import org.chromium.content.R;
 
 @JNINamespace("content")
 public class ContentVideoView extends FrameLayout implements MediaPlayerControl,
@@ -201,12 +201,12 @@ public class ContentVideoView extends FrameLayout implements MediaPlayerControl,
         if (mPlaybackErrorText != null) return;
 
         mPlaybackErrorText = context.getString(
-                AppResource.STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR);
+                R.string.media_player_error_text_invalid_progressive_playback);
         mUnknownErrorText = context.getString(
-                AppResource.STRING_MEDIA_PLAYER_MESSAGE_UNKNOWN_ERROR);
-        mErrorButton = context.getString(AppResource.STRING_MEDIA_PLAYER_ERROR_BUTTON);
-        mErrorTitle = context.getString(AppResource.STRING_MEDIA_PLAYER_ERROR_TITLE);
-        mVideoLoadingText = context.getString(AppResource.STRING_MEDIA_PLAYER_LOADING_VIDEO);
+                R.string.media_player_error_text_unknown);
+        mErrorButton = context.getString(R.string.media_player_error_button);
+        mErrorTitle = context.getString(R.string.media_player_error_title);
+        mVideoLoadingText = context.getString(R.string.media_player_loading_video);
     }
 
     void showContentVideoView() {
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index ae79476..727d895 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -40,10 +40,10 @@ 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;
 
 /**
@@ -284,11 +284,6 @@ public class ContentViewCore implements MotionEventDelegate {
     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
@@ -507,11 +502,11 @@ public class ContentViewCore implements MotionEventDelegate {
         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) {
diff --git a/content/public/android/java/src/org/chromium/content/browser/DateTimePickerDialog.java b/content/public/android/java/src/org/chromium/content/browser/DateTimePickerDialog.java
index 409b88c..97388fb 100644
--- a/content/public/android/java/src/org/chromium/content/browser/DateTimePickerDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DateTimePickerDialog.java
@@ -17,7 +17,7 @@ import android.widget.TimePicker;
 import android.widget.DatePicker.OnDateChangedListener;
 import android.widget.TimePicker.OnTimeChangedListener;
 
-import org.chromium.content.app.AppResource;
+import org.chromium.content.R;
 
 class DateTimePickerDialog extends AlertDialog implements OnClickListener,
         OnDateChangedListener, OnTimeChangedListener {
@@ -88,27 +88,21 @@ class DateTimePickerDialog extends AlertDialog implements OnClickListener,
 
         mCallBack = callBack;
 
-        assert AppResource.STRING_DATE_PICKER_DIALOG_SET != 0;
-        assert AppResource.STRING_DATE_TIME_PICKER_DIALOG_TITLE != 0;
-        assert AppResource.LAYOUT_DATE_TIME_PICKER_DIALOG != 0;
-        assert AppResource.ID_DATE_PICKER != 0;
-        assert AppResource.ID_TIME_PICKER != 0;
-
         setButton(BUTTON_POSITIVE, context.getText(
-                AppResource.STRING_DATE_PICKER_DIALOG_SET), this);
+                R.string.date_picker_dialog_set), this);
         setButton(BUTTON_NEGATIVE, context.getText(android.R.string.cancel),
                 (OnClickListener) null);
         setIcon(0);
-        setTitle(context.getText(AppResource.STRING_DATE_TIME_PICKER_DIALOG_TITLE));
+        setTitle(context.getText(R.string.date_time_picker_dialog_title));
 
         LayoutInflater inflater =
                 (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View view = inflater.inflate(AppResource.LAYOUT_DATE_TIME_PICKER_DIALOG, null);
+        View view = inflater.inflate(R.layout.date_time_picker_dialog, null);
         setView(view);
-        mDatePicker = (DatePicker) view.findViewById(AppResource.ID_DATE_PICKER);
+        mDatePicker = (DatePicker) view.findViewById(R.id.date_picker);
         mDatePicker.init(year, monthOfYear, dayOfMonth, this);
 
-        mTimePicker = (TimePicker) view.findViewById(AppResource.ID_TIME_PICKER);
+        mTimePicker = (TimePicker) view.findViewById(R.id.time_picker);
         mTimePicker.setIs24HourView(is24HourView);
         mTimePicker.setCurrentHour(hourOfDay);
         mTimePicker.setCurrentMinute(minute);
diff --git a/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java
index f538768..421dec4 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java
@@ -20,7 +20,6 @@ import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.content.app.AppResource;
 
 // We have to adapt and plumb android IME service and chrome text input API.
 // ImeAdapter provides an interface in both ways native <-> java:
diff --git a/content/public/android/java/src/org/chromium/content/browser/InputDialogContainer.java b/content/public/android/java/src/org/chromium/content/browser/InputDialogContainer.java
index 58ff8db..389b4fd 100644
--- a/content/public/android/java/src/org/chromium/content/browser/InputDialogContainer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/InputDialogContainer.java
@@ -18,9 +18,9 @@ import android.text.format.Time;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
 
-import org.chromium.content.app.AppResource;
 import org.chromium.content.browser.DateTimePickerDialog.OnDateTimeSetListener;
 import org.chromium.content.browser.MonthPickerDialog.OnMonthSetListener;
+import org.chromium.content.R;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -109,11 +109,8 @@ class InputDialogContainer {
                     time.year, time.month);
         }
 
-        assert AppResource.STRING_DATE_PICKER_DIALOG_SET != 0;
-        assert AppResource.STRING_DATE_PICKER_DIALOG_CLEAR != 0;
-
         mDialog.setButton(DialogInterface.BUTTON_POSITIVE,
-                mContext.getText(AppResource.STRING_DATE_PICKER_DIALOG_SET),
+                mContext.getText(R.string.date_picker_dialog_set),
                 (DialogInterface.OnClickListener) mDialog);
 
         mDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
@@ -126,7 +123,7 @@ class InputDialogContainer {
                 });
 
         mDialog.setButton(DialogInterface.BUTTON_NEUTRAL,
-                mContext.getText(AppResource.STRING_DATE_PICKER_DIALOG_CLEAR),
+                mContext.getText(R.string.date_picker_dialog_clear),
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
diff --git a/content/public/android/java/src/org/chromium/content/browser/MonthPicker.java b/content/public/android/java/src/org/chromium/content/browser/MonthPicker.java
index f70a771..75794ee 100644
--- a/content/public/android/java/src/org/chromium/content/browser/MonthPicker.java
+++ b/content/public/android/java/src/org/chromium/content/browser/MonthPicker.java
@@ -24,7 +24,7 @@ import java.util.Calendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.chromium.content.app.AppResource;
+import org.chromium.content.R;
 
 // This class is heavily based on android.widget.DatePicker.
 public class MonthPicker extends FrameLayout {
@@ -94,8 +94,7 @@ public class MonthPicker extends FrameLayout {
 
         LayoutInflater inflater = (LayoutInflater) context
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        assert AppResource.LAYOUT_MONTH_PICKER != 0;
-        inflater.inflate(AppResource.LAYOUT_MONTH_PICKER, this, true);
+        inflater.inflate(R.layout.month_picker, this, true);
 
         OnValueChangeListener onChangeListener = new OnValueChangeListener() {
             public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -121,12 +120,10 @@ public class MonthPicker extends FrameLayout {
             }
         };
 
-        assert AppResource.ID_MONTH_YEAR_PICKERS_CONTAINER != 0;
-        mSpinners = (LinearLayout) findViewById(AppResource.ID_MONTH_YEAR_PICKERS_CONTAINER);
+        mSpinners = (LinearLayout) findViewById(R.id.pickers);
 
         // month
-        assert AppResource.ID_MONTH_PICKER != 0;
-        mMonthSpinner = (NumberPicker) findViewById(AppResource.ID_MONTH_PICKER);
+        mMonthSpinner = (NumberPicker) findViewById(R.id.month);
         mMonthSpinner.setMinValue(0);
         mMonthSpinner.setMaxValue(mNumberOfMonths - 1);
         mMonthSpinner.setDisplayedValues(mShortMonths);
@@ -134,8 +131,7 @@ public class MonthPicker extends FrameLayout {
         mMonthSpinner.setOnValueChangedListener(onChangeListener);
 
         // year
-        assert AppResource.ID_YEAR_PICKER != 0;
-        mYearSpinner = (NumberPicker) findViewById(AppResource.ID_YEAR_PICKER);
+        mYearSpinner = (NumberPicker) findViewById(R.id.year);
         mYearSpinner.setOnLongPressUpdateInterval(100);
         mYearSpinner.setOnValueChangedListener(onChangeListener);
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/MonthPickerDialog.java b/content/public/android/java/src/org/chromium/content/browser/MonthPickerDialog.java
index 23fe793..94f07fa 100644
--- a/content/public/android/java/src/org/chromium/content/browser/MonthPickerDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/MonthPickerDialog.java
@@ -13,8 +13,8 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import org.chromium.content.app.AppResource;
 import org.chromium.content.browser.MonthPicker.OnMonthChangedListener;
+import org.chromium.content.R;
 
 public class MonthPickerDialog extends AlertDialog implements OnClickListener,
         OnMonthChangedListener {
@@ -68,23 +68,18 @@ public class MonthPickerDialog extends AlertDialog implements OnClickListener,
 
         mCallBack = callBack;
 
-        assert AppResource.STRING_DATE_PICKER_DIALOG_SET != 0;
-        assert AppResource.STRING_MONTH_PICKER_DIALOG_TITLE != 0;
-        assert AppResource.LAYOUT_MONTH_PICKER_DIALOG != 0;
-        assert AppResource.ID_DATE_PICKER != 0;
-
         setButton(BUTTON_POSITIVE, context.getText(
-                AppResource.STRING_DATE_PICKER_DIALOG_SET), this);
+                R.string.date_picker_dialog_set), this);
         setButton(BUTTON_NEGATIVE, context.getText(android.R.string.cancel),
                 (OnClickListener) null);
         setIcon(0);
-        setTitle(AppResource.STRING_MONTH_PICKER_DIALOG_TITLE);
+        setTitle(R.string.month_picker_dialog_title);
 
         LayoutInflater inflater =
                 (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View view = inflater.inflate(AppResource.LAYOUT_MONTH_PICKER_DIALOG, null);
+        View view = inflater.inflate(R.layout.month_picker_dialog, null);
         setView(view);
-        mMonthPicker = (MonthPicker) view.findViewById(AppResource.ID_DATE_PICKER);
+        mMonthPicker = (MonthPicker) view.findViewById(R.id.date_picker);
         mMonthPicker.init(year, monthOfYear, this);
     }
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
index f8835c3..3612698 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
@@ -28,7 +28,7 @@ import android.view.View;
 import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
 
-import org.chromium.content.app.AppResource;
+import org.chromium.content.R;
 
 /**
  * PopupZoomer is used to show the on-demand link zooming popup. It handles manipulation of the
@@ -110,12 +110,9 @@ class PopupZoomer extends View {
     private GestureDetector mGestureDetector;
 
     private static float getOverlayCornerRadius(Context context) {
-        // TODO(leandrogracia): restore an assertion for the resource id != 0
-        // here after fixing crbug.com/136704
-        // assert AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS != 0;
-        if (sOverlayCornerRadius == 0 && AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS != 0)
+        if (sOverlayCornerRadius == 0)
             sOverlayCornerRadius = context.getResources().getDimension(
-                    AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS);
+                    R.dimen.link_preview_overlay_radius);
         return sOverlayCornerRadius;
     }
 
@@ -127,7 +124,7 @@ class PopupZoomer extends View {
         if (sOverlayDrawable == null) {
             try {
                 sOverlayDrawable = context.getResources().getDrawable(
-                        AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY);
+                        R.drawable.ondemand_overlay);
             } catch (Resources.NotFoundException e) {
                 Log.w(LOGTAG, "No drawable resource for PopupZoomer overlay found.");
                 sOverlayDrawable = new ColorDrawable();
diff --git a/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java b/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java
index ba7c4e1..14bea2b 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java
@@ -16,7 +16,7 @@ import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import org.chromium.content.app.AppResource;
+import org.chromium.content.R;
 
 /**
  * An ActionMode.Callback for in-page selection. This class handles both the editable and
@@ -155,20 +155,15 @@ public class SelectActionModeCallback implements ActionMode.Callback {
 
         if (!mEditable) {
             if (isShareHandlerAvailable()) {
-                assert AppResource.STRING_ACTION_BAR_SHARE != 0;
-                assert AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE != 0;
-                menu.add(Menu.NONE, ID_SHARE, Menu.NONE, AppResource.STRING_ACTION_BAR_SHARE).
-                    setIcon(AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE).
+                menu.add(Menu.NONE, ID_SHARE, Menu.NONE, R.string.actionbar_share).
+                    setIcon(R.drawable.ic_menu_share_holo_light).
                     setShowAsAction(
                             MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
             }
 
             if (!mIncognito && isWebSearchAvailable()) {
-                assert AppResource.STRING_ACTION_BAR_WEB_SEARCH != 0;
-                assert AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH != 0;
-                menu.add(Menu.NONE, ID_SEARCH, Menu.NONE,
-                        AppResource.STRING_ACTION_BAR_WEB_SEARCH).
-                    setIcon(AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH).
+                menu.add(Menu.NONE, ID_SEARCH, Menu.NONE, R.string.actionbar_web_search).
+                    setIcon(R.drawable.ic_menu_search_holo_light).
                     setShowAsAction(
                             MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
             }
@@ -200,9 +195,8 @@ public class SelectActionModeCallback implements ActionMode.Callback {
                     send.setType("text/plain");
                     send.putExtra(Intent.EXTRA_TEXT, selection);
                     try {
-                        assert AppResource.STRING_ACTION_BAR_SHARE != 0;
                         Intent i = Intent.createChooser(send, getContext().getString(
-                                AppResource.STRING_ACTION_BAR_SHARE));
+                                R.string.actionbar_share));
                         i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         getContext().startActivity(i);
                     } catch (android.content.ActivityNotFoundException ex) {