chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/developer_private/developer_private_api.cc ('k') | chrome/browser/extensions/api/feedback_private/feedback_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

index e92dd42aa22caefcaab353aecea05f06b822cf1c..43f641c59628b88546fc0afac643644047e97aff 100644

--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

@@ -14,8 +14,8 @@

#include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"

#include "chrome/browser/signin/easy_unlock_service.h"

#include "chrome/common/extensions/api/easy_unlock_private.h"

+#include "chrome/grit/generated_resources.h"

#include "extensions/browser/browser_context_keyed_api_factory.h"

-#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

#if defined(OS_CHROMEOS)