diff options
Diffstat (limited to 'chrome/browser/ui')
47 files changed, 50 insertions, 50 deletions
diff --git a/chrome/browser/ui/app_list/app_list_util.h b/chrome/browser/ui/app_list/app_list_util.h index 789eeea..41ac242 100644 --- a/chrome/browser/ui/app_list/app_list_util.h +++ b/chrome/browser/ui/app_list/app_list_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_UTIL_H_ #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" class PrefRegistrySimple; class Profile; diff --git a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc index 01b1daa..af154d2 100644 --- a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc +++ b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service_unittest.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc index d790fc6..8f8d23e 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc @@ -11,7 +11,7 @@ #include "ash/launcher/launcher_model.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc index cbd84fa..d8f89a0 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc @@ -11,7 +11,7 @@ #include "ash/launcher/launcher_model.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/values.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc index 4e82bc1..9ca03c1 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -6,7 +6,7 @@ #include "ash/ash_switches.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/time.h" #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index 8d38b4b..52182d6 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -11,8 +11,8 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/stringprintf.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 3908a6a..40215ab 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc index 9a1bb2c..d5a6c10 100644 --- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc +++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" #include "base/string16.h" diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 9e16e05..7bf0063 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h index e8c61ea..a91db0d 100644 --- a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h +++ b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h @@ -9,7 +9,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_to_mobile_service.h" diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm index 8f1c603..f408c55 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #import "base/mac/foundation_util.h" #include "base/native_library.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_button.h b/chrome/browser/ui/cocoa/download/download_item_button.h index a4af812..ecc2ee3 100644 --- a/chrome/browser/ui/cocoa/download/download_item_button.h +++ b/chrome/browser/ui/cocoa/download/download_item_button.h @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #import "chrome/browser/ui/cocoa/draggable_button.h" @class DownloadItemController; diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.h b/chrome/browser/ui/cocoa/download/download_item_cell.h index 0284012..c73f9c8 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.h +++ b/chrome/browser/ui/cocoa/download/download_item_cell.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class DownloadItemModel; @class IndeterminateProgressTimer; diff --git a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm index f97cddf..f2cc313 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm @@ -4,7 +4,7 @@ // Download utility test for Mac OS X. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm index b79db4d..98a9d5f 100644 --- a/chrome/browser/ui/cocoa/drag_util.mm +++ b/chrome/browser/ui/cocoa/drag_util.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/drag_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm index d9a3a1b..bfc82e4 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm index 495ca2d..2f93349 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 14c81fe..6c150bf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/values.h" diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h index 75ca97d..09230cf 100644 --- a/chrome/browser/ui/extensions/application_launch.h +++ b/chrome/browser/ui/extensions/application_launch.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ #define CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/extensions/extension_constants.h" #include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h index 3c5f10f..fcb5eea 100644 --- a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h +++ b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h @@ -16,7 +16,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chrome_to_mobile_service.h" diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc index ed48990..f813ba2 100644 --- a/chrome/browser/ui/gtk/custom_drag.cc +++ b/chrome/browser/ui/gtk/custom_drag.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/custom_drag.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "content/public/browser/download_item.h" diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h index 51feb42..eb37379 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.h +++ b/chrome/browser/ui/hung_plugin_tab_helper.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/string16.h" #include "base/time.h" diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index 93a5828..f5078f3 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -8,8 +8,8 @@ #include "base/base_paths.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index aa09b14..3fcdbab 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc @@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 8239f22..ff86e6f 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h index 91da5e4..07652c1 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.h +++ b/chrome/browser/ui/startup/startup_browser_creator.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 6e32f48..933a7ac 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h index 4a0905c..91c1edf 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/ui/startup/startup_tab.h" #include "chrome/browser/ui/startup/startup_types.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc index 9b906ae..77da246 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 0a0b962..981293d 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -7,8 +7,8 @@ #include <map> #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stl_util.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index b78ab62..72acf00 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/host_zoom_map.h" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index accf174..fbec838 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/break_iterator.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/ui/views/find_bar_controller_browsertest.cc b/chrome/browser/ui/views/find_bar_controller_browsertest.cc index 9d65b95..a4171d7 100644 --- a/chrome/browser/ui/views/find_bar_controller_browsertest.cc +++ b/chrome/browser/ui/views/find_bar_controller_browsertest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "base/file_path.h" -#include "chrome/browser/ui/browser_commands.h" +#include "base/files/file_path.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc index 635031f..1383534 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/select_file_dialog_extension.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 8bb9c44..85f161b 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -3,15 +3,15 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/views/user_data_dir_dialog_view.h b/chrome/browser/ui/views/user_data_dir_dialog_view.h index 2902c6e8..0355e30 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog_view.h +++ b/chrome/browser/ui/views/user_data_dir_dialog_view.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "ui/views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index 9b72c9e..37fe1c7 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 9bbd3b4..c509cdf 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -17,9 +17,9 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" +#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" -#include "googleurl/src/gurl.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.h b/chrome/browser/ui/webui/extensions/install_extension_handler.h index c029d9a..2795bdc 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index af8135a..b0d4609 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/string_split.h" diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index ce8e54c..dc50207 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/icon_manager.h" #include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 16bc518..e86d541 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -14,8 +14,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index fb97774..c88584d 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index 522acaf..954a875a 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.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_path.h" +#include "base/files/file_path.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/web_ui_browsertest.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index 48dd6c9..ca04485 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.cc b/chrome/browser/ui/webui/print_preview/sticky_settings.cc index 1203db6..e487e83 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.cc +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 30f7123..19e8003 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" |