chrome/browser/sync/profile_sync_service_android.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/sync/profile_sync_service_android.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: 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

« chrome/browser/password_manager/password_manager_util_win.cc ('K') | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/sync_error_notifier_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_android.cc

diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc

index 02e3556c38b846a34bfdfa576ae8752cad9a2626..868b65000d6b5e6237720604ad2703e2d265fa57 100644

--- a/chrome/browser/sync/profile_sync_service_android.cc

+++ b/chrome/browser/sync/profile_sync_service_android.cc

@@ -22,6 +22,7 @@

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/sync/sync_ui_util.h"

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

#include "components/invalidation/object_id_invalidation_map.h"

#include "components/signin/core/browser/signin_manager.h"

#include "components/sync_driver/pref_names.h"

@@ -32,7 +33,6 @@

#include "google/cacheinvalidation/types.pb.h"

#include "google_apis/gaia/gaia_constants.h"

#include "google_apis/gaia/google_service_auth_error.h"

-#include "grit/generated_resources.h"

#include "jni/ProfileSyncService_jni.h"

#include "sync/internal_api/public/read_transaction.h"

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