chrome/browser/sync/sync_ui_util.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/sync_ui_util.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/sync_global_error.cc ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sync_ui_util.cc

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

index 3a15e24fdd117b1ea829a2075ecd05ad9fd77fd3..0214988a3edc749febfc3f9fd40952ad12954fc7 100644

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

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

@@ -22,13 +22,13 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

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

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

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

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

#include "google_apis/gaia/google_service_auth_error.h"

#include "grit/browser_resources.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "sync/internal_api/public/base/model_type.h"

#include "sync/internal_api/public/sessions/sync_session_snapshot.h"