diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /chrome/plugin | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/chrome_content_plugin_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc index 32e4ea7d03..c6712ab150 100644 --- a/chrome/plugin/chrome_content_plugin_client.cc +++ b/chrome/plugin/chrome_content_plugin_client.cc @@ -20,7 +20,7 @@ #if defined(OS_MACOSX) #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/sys_string_conversions.h" +#include "base/strings/sys_string_conversions.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #endif |