chrome/browser/password_manager/password_manager_util_win.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/password_manager/password_manager_util_win.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/password_manager/password_manager_util_mac.mm ('k') | chrome/browser/password_manager/save_password_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/password_manager/password_manager_util_win.cc

diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc

index 4920148b9f03a3c8a8a43dac2e586f7ed91a0737..cf2043443e94598389e9e4810be2f8463a81b9b8 100644

--- a/chrome/browser/password_manager/password_manager_util_win.cc

+++ b/chrome/browser/password_manager/password_manager_util_win.cc

@@ -4,8 +4,8 @@

// windows.h must be first otherwise Win8 SDK breaks.

#include <windows.h>

-#include <wincred.h>

#include <LM.h>

+#include <wincred.h>

// SECURITY_WIN32 must be defined in order to get

// EXTENDED_NAME_FORMAT enumeration.

@@ -21,11 +21,11 @@

#include "base/time/time.h"

#include "base/win/windows_version.h"

#include "chrome/browser/browser_process.h"

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

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

#include "components/password_manager/core/common/password_manager_pref_names.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/render_widget_host_view.h"

-#include "grit/chromium_strings.h"

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

#if defined(USE_AURA)