chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.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: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.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 | « chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java

index a1a2de652507c9406b8a2f295ce1ba9825a00850..8f77b3120dbfb2d539ee08d800f045f7234d87a7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java

@@ -11,7 +11,7 @@ import android.database.Cursor;

import android.provider.BaseColumns;

import android.provider.Browser.BookmarkColumns;

-import org.chromium.content.app.AppResource;

+import org.chromium.chrome.R;

/**

* For bookmarks/history suggestions, wrap the cursor returned in one that can feed

@@ -71,8 +71,7 @@ class ChromeBrowserProviderSuggestionsCursor extends AbstractCursor {

return mCursor.getString(mCursor.getColumnIndex(BookmarkColumns.URL));

case COLUMN_SUGGEST_ICON_1:

// This is the icon displayed to the left of the result in QSB.

- assert AppResource.DRAWABLE_ICON_APP_ICON != 0;

- return Integer.toString(AppResource.DRAWABLE_ICON_APP_ICON);

+ return Integer.toString(R.mipmap.icon);

case COLUMN_SUGGEST_LAST_ACCESS_HINT:

// After clearing history, the Chrome bookmarks database will have a last

// access time of 0 for all bookmarks. In the Android provider, this will