summaryrefslogtreecommitdiffstats
path: root/chrome/browser/password_manager
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 10:18:18 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 10:20:07 +0000
commitaf39f00e1d36360ab4119b873f2a9cc961d4464b (patch)
treecb520de46867506827af3cd9ac71c55cfc323f75 /chrome/browser/password_manager
parent0a0291c65f3cc23cc1b5a3c211019fce1d8ab007 (diff)
downloadchromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.zip
chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.gz
chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.bz2
Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 1)
BUG=401588 Review URL: https://codereview.chromium.org/469993006 Cr-Commit-Position: refs/heads/master@{#291367} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/password_manager')
-rw-r--r--chrome/browser/password_manager/native_backend_kwallet_x.cc2
-rw-r--r--chrome/browser/password_manager/password_manager_util_mac.mm4
-rw-r--r--chrome/browser/password_manager/password_manager_util_win.cc4
-rw-r--r--chrome/browser/password_manager/save_password_infobar_delegate.cc4
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc
index ca346cd..933c673 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc
@@ -13,13 +13,13 @@
#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_restrictions.h"
+#include "chrome/grit/chromium_strings.h"
#include "components/autofill/core/common/password_form.h"
#include "content/public/browser/browser_thread.h"
#include "dbus/bus.h"
#include "dbus/message.h"
#include "dbus/object_path.h"
#include "dbus/object_proxy.h"
-#include "grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
using autofill::PasswordForm;
diff --git a/chrome/browser/password_manager/password_manager_util_mac.mm b/chrome/browser/password_manager/password_manager_util_mac.mm
index 9bbf02a..f47f116 100644
--- a/chrome/browser/password_manager/password_manager_util_mac.mm
+++ b/chrome/browser/password_manager/password_manager_util_mac.mm
@@ -4,15 +4,15 @@
#include "chrome/browser/password_manager/password_manager_util.h"
-#import <Foundation/Foundation.h>
#include <CoreFoundation/CoreFoundation.h>
+#import <Foundation/Foundation.h>
#include <Security/Authorization.h>
#include "base/basictypes.h"
#include "base/mac/authorization_util.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_authorizationref.h"
-#include "grit/chromium_strings.h"
+#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
namespace password_manager_util {
diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc
index 4920148..cf20434 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)
diff --git a/chrome/browser/password_manager/save_password_infobar_delegate.cc b/chrome/browser/password_manager/save_password_infobar_delegate.cc
index 9c13760..882bde0 100644
--- a/chrome/browser/password_manager/save_password_infobar_delegate.cc
+++ b/chrome/browser/password_manager/save_password_infobar_delegate.cc
@@ -8,14 +8,14 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/ui/sync/one_click_signin_helper.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
#include "components/infobars/core/infobar.h"
#include "components/password_manager/core/browser/password_form_manager.h"
#include "components/signin/core/common/profile_management_switches.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
#include "google_apis/gaia/gaia_urls.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"