chrome/browser/ui/android/navigation_popup.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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/browser/ui/android/navigation_popup.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/android/navigation_popup.cc

diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc

index 0e5a6554221fa9ab9527b5bae1b098845ffa967d..877bbacbe23e4de7df4d2c43cc5fc3d113a06cb0 100644

--- a/chrome/browser/ui/android/navigation_popup.cc

+++ b/chrome/browser/ui/android/navigation_popup.cc

@@ -14,12 +14,12 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/url_constants.h"

-#include "grit/ui_resources.h"

#include "jni/NavigationPopup_jni.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/android/java_bitmap.h"

#include "ui/gfx/image/image.h"

+#include "ui/resources/grit/ui_resources.h"

#include "url/gurl.h"

using base::android::ConvertUTF8ToJavaString;