Skip to content

Commit

Permalink
Move file_path.h to base/files.
Browse files Browse the repository at this point in the history
TBR=sky

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184344 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Feb 24, 2013
1 parent 8701de1 commit 5799981
Show file tree
Hide file tree
Showing 1,203 changed files with 1,790 additions and 1,781 deletions.
2 changes: 1 addition & 1 deletion android_webview/browser/aw_browser_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "android_webview/browser/aw_download_manager_delegate.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "components/visitedlink/browser/visitedlink_delegate.h"
Expand Down
2 changes: 1 addition & 1 deletion android_webview/browser/aw_browser_main_parts.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "android_webview/browser/aw_browser_context.h"
#include "android_webview/browser/aw_result_codes.h"
#include "base/android/build_info.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "content/public/browser/android/compositor.h"
#include "content/public/browser/content_browser_client.h"
Expand Down
2 changes: 1 addition & 1 deletion android_webview/browser/aw_download_manager_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "android_webview/browser/aw_download_manager_delegate.h"

#include "base/file_path.h"
#include "base/files/file_path.h"
#include "content/public/browser/download_danger_type.h"
#include "content/public/browser/download_item.h"

Expand Down
2 changes: 1 addition & 1 deletion apps/app_host/app_host_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "apps/app_host/update.h"
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/process_util.h"
#include "chrome/installer/launcher_support/chrome_launcher_support.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/shell/content_client/shell_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "ash/shell/content_client/shell_content_browser_client.h"
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "content/public/common/content_switches.h"
#include "ui/base/resource/resource_bundle.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/system/tray/system_tray_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "ash/ash_export.h"
#include "ash/system/power/power_supply_status.h"
#include "ash/system/user/login_status.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/i18n/time_formatting.h"
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/test/test_metro_viewer_process_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <shlobj.h>

#include "base/command_line.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/string16.h"
#include "base/time.h"
#include "base/win/scoped_com_initializer.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/test/test_suite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "ash/test/test_suite.h"

#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/test/test_suite_init.mm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#import <Cocoa/Cocoa.h>

#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/mac/bundle_locations.h"
#include "base/memory/scoped_nsobject.h"
#include "base/path_service.h"
Expand Down
4 changes: 2 additions & 2 deletions base/android/path_service_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include "base/android/path_service_android.h"

#include "base/file_path.h"
#include "base/path_service.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "jni/PathService_jni.h"

namespace base {
Expand Down
2 changes: 1 addition & 1 deletion base/android/path_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "base/file_path.h"
#include "base/files/file_path.h"

#include "jni/PathUtils_jni.h"

Expand Down
2 changes: 1 addition & 1 deletion base/android/path_utils_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// found in the LICENSE file.

#include "base/android/path_utils.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"

#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion base/base.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,10 @@
'debug/trace_event_unittest.h',
'debug/trace_event_win_unittest.cc',
'environment_unittest.cc',
'file_path_unittest.cc',
'file_util_unittest.cc',
'file_version_info_unittest.cc',
'files/dir_reader_posix_unittest.cc',
'files/file_path_unittest.cc',
'files/file_util_proxy_unittest.cc',
'files/important_file_writer_unittest.cc',
'files/scoped_temp_dir_unittest.cc',
Expand Down
4 changes: 2 additions & 2 deletions base/base.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@
'environment.cc',
'environment.h',
'file_descriptor_posix.h',
'file_path.cc',
'file_path.h',
'file_util.cc',
'file_util.h',
'file_util_android.cc',
Expand All @@ -158,6 +156,8 @@
'files/dir_reader_fallback.h',
'files/dir_reader_linux.h',
'files/dir_reader_posix.h',
'files/file_path.cc',
'files/file_path.h',
'files/file_path_watcher.cc',
'files/file_path_watcher.h',
'files/file_path_watcher_kqueue.cc',
Expand Down
2 changes: 1 addition & 1 deletion base/base_paths.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "base/base_paths.h"

#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/path_service.h"

namespace base {
Expand Down
2 changes: 1 addition & 1 deletion base/base_paths_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "base/android/jni_android.h"
#include "base/android/path_utils.h"
#include "base/base_paths.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/process_util.h"

Expand Down
2 changes: 1 addition & 1 deletion base/base_paths_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include "base/base_paths.h"
#include "base/compiler_specific.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/path_service.h"
Expand Down
4 changes: 2 additions & 2 deletions base/base_paths_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

#include "base/base_paths.h"
#include "base/environment.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/nix/xdg_util.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/nix/xdg_util.h"
#include "build/build_config.h"

#if defined(OS_FREEBSD)
Expand Down
2 changes: 1 addition & 1 deletion base/base_paths_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <shlobj.h>

#include "base/base_paths.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/win/scoped_co_mem.h"
#include "base/win/windows_version.h"
Expand Down
2 changes: 1 addition & 1 deletion base/command_line.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <ostream>

#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_split.h"
Expand Down
2 changes: 1 addition & 1 deletion base/command_line_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
Loading

0 comments on commit 5799981

Please sign in to comment.