diff options
Diffstat (limited to 'ui/base')
-rw-r--r-- | ui/base/dragdrop/drag_utils.cc | 2 | ||||
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_unittest.cc | 2 | ||||
-rw-r--r-- | ui/base/l10n/l10n_util.cc | 2 | ||||
-rw-r--r-- | ui/base/l10n/l10n_util_unittest.cc | 2 | ||||
-rw-r--r-- | ui/base/resource/data_pack.cc | 2 | ||||
-rw-r--r-- | ui/base/resource/data_pack_unittest.cc | 2 | ||||
-rw-r--r-- | ui/base/resource/resource_bundle.cc | 2 | ||||
-rw-r--r-- | ui/base/resource/resource_bundle_android.cc | 2 | ||||
-rw-r--r-- | ui/base/resource/resource_bundle_ios.mm | 2 | ||||
-rw-r--r-- | ui/base/resource/resource_bundle_mac.mm | 2 | ||||
-rw-r--r-- | ui/base/resource/resource_bundle_unittest.cc | 2 | ||||
-rw-r--r-- | ui/base/ui_base_paths.cc | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc index b9faf3f..53f3e99 100644 --- a/ui/base/dragdrop/drag_utils.cc +++ b/ui/base/dragdrop/drag_utils.cc @@ -4,7 +4,7 @@ #include "ui/base/dragdrop/drag_utils.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc index ff0ddfc..8f685c8 100644 --- a/ui/base/dragdrop/os_exchange_data_unittest.cc +++ b/ui/base/dragdrop/os_exchange_data_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 2a93d61..54f4145 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/rtl.h" #include "base/i18n/string_compare.h" diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 972dd26..cc25d36 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/environment.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/i18n/case_conversion.h" #include "base/i18n/rtl.h" #include "base/path_service.h" diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc index 705c1a0..f4a9e47 100644 --- a/ui/base/resource/data_pack.cc +++ b/ui/base/resource/data_pack.cc @@ -6,7 +6,7 @@ #include <errno.h> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/memory_mapped_file.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index 6fcaeb3..8a88e02 100644 --- a/ui/base/resource/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/strings/string_piece.h" diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index 8d0aa547..d7e7411 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -9,8 +9,8 @@ #include "base/big_endian.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc index 630ad5c..9dc036e 100644 --- a/ui/base/resource/resource_bundle_android.cc +++ b/ui/base/resource/resource_bundle_android.cc @@ -8,8 +8,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm index 4f5d9bc..736e6ba 100644 --- a/ui/base/resource/resource_bundle_ios.mm +++ b/ui/base/resource/resource_bundle_ios.mm @@ -8,8 +8,8 @@ #import <UIKit/UIKit.h> #include "base/basictypes.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 2863e08..13b2778 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -7,8 +7,8 @@ #import <AppKit/AppKit.h> #include "base/basictypes.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsobject.h" diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index 7e7567b..1a3d7be 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -6,8 +6,8 @@ #include "base/base_paths.h" #include "base/big_endian.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc index 4cdf7c1..083315d 100644 --- a/ui/base/ui_base_paths.cc +++ b/ui/base/ui_base_paths.cc @@ -5,8 +5,8 @@ #include "ui/base/ui_base_paths.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" |