chrome/browser/ui/sync/one_click_signin_helper.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/sync/one_click_signin_helper.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (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/ui/startup/session_crashed_infobar_delegate.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/one_click_signin_helper.cc

diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc

index 78ff0b9e58bbb5e0665a65e133f6affa8217e0a2..faf5121a5c92d3e55bafa2a2c0fd943eb2e9b097 100644

--- a/chrome/browser/ui/sync/one_click_signin_helper.cc

+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc

@@ -59,6 +59,8 @@

#include "chrome/common/net/url_util.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/autofill/core/common/password_form.h"

#include "components/google/core/browser/google_util.h"

#include "components/password_manager/core/browser/password_manager.h"

@@ -80,8 +82,6 @@

#include "content/public/common/page_transition_types.h"

#include "google_apis/gaia/gaia_auth_util.h"

#include "google_apis/gaia/gaia_urls.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ipc/ipc_message_macros.h"

#include "net/base/url_util.h"