From 7c34636bdfb0d6b6c0dc91e76be3a93e07314f17 Mon Sep 17 00:00:00 2001 From: "newt@chromium.org" Date: Tue, 27 Nov 2012 10:53:31 +0000 Subject: Remove AppResource and unneeded resources. Now that content and chrome have their own resources and are accessing them via the org.chromium.[content|chrome].R classes, we can remove the duplicates of these resources that live in content shell and test shell as well as any remaining references to AppResource.java. This is the third 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/11377117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169633 0039d316-1c4b-4281-b951-d872f2087c98 --- .../chromium/content_shell/ContentShellActivity.java | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'content/shell/android/java/src') diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java index 00cd670..2a6a0c5 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java @@ -11,7 +11,6 @@ import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; -import org.chromium.content.app.AppResource; import org.chromium.content.app.LibraryLoader; import org.chromium.content.browser.ContentVideoView; import org.chromium.content.browser.ContentView; @@ -51,7 +50,6 @@ public class ContentShellActivity extends Activity { DeviceUtils.addDeviceSpecificUserAgentSwitch(this); LibraryLoader.ensureInitialized(); - initializeContentViewResources(); setContentView(R.layout.content_shell_activity); mShellManager = (ShellManager) findViewById(R.id.shell_container); @@ -175,21 +173,4 @@ public class ContentShellActivity extends Activity { Shell shell = getActiveShell(); return shell != null ? shell.getContentView() : null; } - - private void initializeContentViewResources() { - AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius; - AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE = R.drawable.ic_menu_share_holo_light; - AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH = R.drawable.ic_menu_search_holo_light; - AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay; - AppResource.STRING_ACTION_BAR_SHARE = R.string.action_bar_share; - AppResource.STRING_ACTION_BAR_WEB_SEARCH = R.string.action_bar_search; - AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION = R.string.accessibility_content_view; - AppResource.STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR = - R.string.media_player_error_text_invalid_progressive_playback; - AppResource.STRING_MEDIA_PLAYER_MESSAGE_UNKNOWN_ERROR = - R.string.media_player_error_text_unknown; - AppResource.STRING_MEDIA_PLAYER_ERROR_BUTTON = R.string.media_player_error_button; - AppResource.STRING_MEDIA_PLAYER_ERROR_TITLE = R.string.media_player_error_title; - AppResource.STRING_MEDIA_PLAYER_LOADING_VIDEO = R.string.media_player_loading_video; - } } -- cgit v1.1