diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
| commit | cedac228d2dd51db4b79ea1e72c7f249408ee061 (patch) | |
| tree | aa4ff43d7fe316e95d12721ce5e17653a768a0dd /chrome/browser/sync/sync_ui_util.cc | |
| parent | 6a869ecff032b5bed299d661b078b0555034598b (diff) | |
| download | chromium_org-cedac228d2dd51db4b79ea1e72c7f249408ee061.tar.gz | |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
Diffstat (limited to 'chrome/browser/sync/sync_ui_util.cc')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index d84eab8ee4..fb373b98f0 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -38,7 +38,7 @@ #include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/chromeos/login/users/user_manager.h" #endif // defined(OS_CHROMEOS) typedef GoogleServiceAuthError AuthError; |