diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 06:51:24 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 06:51:24 +0000 |
| commit | 65654eebc3c45cd54d1705416a1ddd868f364627 (patch) | |
| tree | 20ea09d946d91ab7ed999b2f535091de52911743 /chrome_frame | |
| parent | 035b3ef2b3da107ece0632b1e1e8c66e0cb113a1 (diff) | |
| download | chromium_src-65654eebc3c45cd54d1705416a1ddd868f364627.zip chromium_src-65654eebc3c45cd54d1705416a1ddd868f364627.tar.gz chromium_src-65654eebc3c45cd54d1705416a1ddd868f364627.tar.bz2 | |
Use a direct include of the shared_memory header in base/, chrome/, components/.
BUG=260807
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19275015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/dll_redirector.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/dll_redirector.h | 2 | ||||
| -rw-r--r-- | chrome_frame/test/dll_redirector_loading_test.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/dll_redirector_test.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc index 6d094e4..f9cd8a9 100644 --- a/chrome_frame/dll_redirector.cc +++ b/chrome_frame/dll_redirector.cc @@ -12,8 +12,8 @@ #include "base/file_version_info.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/memory/shared_memory.h" #include "base/path_service.h" -#include "base/shared_memory.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" diff --git a/chrome_frame/dll_redirector.h b/chrome_frame/dll_redirector.h index 81c882b..d4c61c1 100644 --- a/chrome_frame/dll_redirector.h +++ b/chrome_frame/dll_redirector.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/memory/singleton.h" -#include "base/shared_memory.h" // Forward namespace ATL { diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 9040204..bb9cbd8 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -10,9 +10,9 @@ #include "base/file_version_info.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/memory/shared_memory.h" #include "base/path_service.h" #include "base/scoped_native_library.h" -#include "base/shared_memory.h" #include "base/strings/string_util.h" #include "base/version.h" #include "base/win/scoped_comptr.h" diff --git a/chrome_frame/test/dll_redirector_test.cc b/chrome_frame/test/dll_redirector_test.cc index 71dcee2..0506823 100644 --- a/chrome_frame/test/dll_redirector_test.cc +++ b/chrome_frame/test/dll_redirector_test.cc @@ -4,7 +4,7 @@ #include "chrome_frame/dll_redirector.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "base/win/scoped_handle.h" |