content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java - Issue 11360207: Add Java resources to content and chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java

Issue 11360207: Add Java resources to content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove obsolete findbugs warnings Created 8 years, 1 month 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/java/res/values/strings.xml ('k') | content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java

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 d98ad19cbc786cbe7744866f3a5b4cc20254f354..6f62a71c015f8dddacbb719c27e437c21207f53e 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