diff options
Diffstat (limited to 'cloud_print')
16 files changed, 25 insertions, 23 deletions
diff --git a/cloud_print/common/win/install_utils.cc b/cloud_print/common/win/install_utils.cc index dd3d28b..6c421ed 100644 --- a/cloud_print/common/win/install_utils.cc +++ b/cloud_print/common/win/install_utils.cc @@ -7,9 +7,9 @@ #include <windows.h> #include "base/command_line.h" -#include "base/file_util.h" #include "base/file_version_info_win.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/process/launch.h" #include "base/win/registry.h" diff --git a/cloud_print/gcp20/prototype/print_job_handler.cc b/cloud_print/gcp20/prototype/print_job_handler.cc index dad81c2..946d5d5 100644 --- a/cloud_print/gcp20/prototype/print_job_handler.cc +++ b/cloud_print/gcp20/prototype/print_job_handler.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/guid.h" #include "base/logging.h" diff --git a/cloud_print/gcp20/prototype/printer.cc b/cloud_print/gcp20/prototype/printer.cc index fdbdf87..01cf062 100644 --- a/cloud_print/gcp20/prototype/printer.cc +++ b/cloud_print/gcp20/prototype/printer.cc @@ -4,15 +4,15 @@ #include "cloud_print/gcp20/prototype/printer.h" -#include <algorithm> #include <limits.h> #include <stdio.h> +#include <algorithm> #include <string> #include <vector> #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/guid.h" #include "base/json/json_reader.h" diff --git a/cloud_print/gcp20/prototype/printer_state.cc b/cloud_print/gcp20/prototype/printer_state.cc index 17ccb6c..9dedf1d 100644 --- a/cloud_print/gcp20/prototype/printer_state.cc +++ b/cloud_print/gcp20/prototype/printer_state.cc @@ -4,7 +4,7 @@ #include "cloud_print/gcp20/prototype/printer_state.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index c00f708..25da2b8 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc @@ -6,7 +6,7 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc index 2e15398..5565269 100644 --- a/cloud_print/service/win/cloud_print_service.cc +++ b/cloud_print/service/win/cloud_print_service.cc @@ -15,7 +15,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/guid.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index 70f50c7..c3c9bc8 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_pump_dispatcher.h" #include "base/run_loop.h" diff --git a/cloud_print/service/win/installer.cc b/cloud_print/service/win/installer.cc index a08b1445..e3ff6a4 100644 --- a/cloud_print/service/win/installer.cc +++ b/cloud_print/service/win/installer.cc @@ -8,7 +8,7 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/win/scoped_com_initializer.h" #include "base/win/shortcut.h" diff --git a/cloud_print/service/win/service_controller.cc b/cloud_print/service/win/service_controller.cc index bdfc44d..4b5d148 100644 --- a/cloud_print/service/win/service_controller.cc +++ b/cloud_print/service/win/service_controller.cc @@ -9,8 +9,8 @@ #include <atlctl.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/path_service.h" #include "base/win/scoped_handle.h" #include "chrome/common/chrome_switches.h" diff --git a/cloud_print/service/win/service_listener.cc b/cloud_print/service/win/service_listener.cc index bdb2217..a022cb3 100644 --- a/cloud_print/service/win/service_listener.cc +++ b/cloud_print/service/win/service_listener.cc @@ -5,8 +5,8 @@ #include "cloud_print/service/win/service_listener.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/json/json_writer.h" #include "base/threading/thread.h" #include "base/values.h" diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 588eb6d..5d32737 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <iomanip> #include <windows.h> -#include <winspool.h> #include <setupapi.h> // Must be included after windows.h +#include <winspool.h> +#include <iomanip> #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/file_version_info_win.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/process/process.h" #include "base/process/launch.h" +#include "base/process/process.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/win/registry.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index e8a8574..c41b805 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -4,22 +4,22 @@ #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" +#include <windows.h> #include <lmcons.h> #include <shellapi.h> #include <shlobj.h> #include <strsafe.h> #include <userenv.h> -#include <windows.h> #include <winspool.h> #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/process/process.h" #include "base/process/launch.h" +#include "base/process/process.h" #include "base/strings/string16.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.h b/cloud_print/virtual_driver/win/port_monitor/port_monitor.h index b836f45..20dae1e 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.h +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.h @@ -7,7 +7,7 @@ #include <windows.h> #include <string> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/process/process.h" #include "base/strings/string16.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc index 43f82c9..c3c0594 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc @@ -4,17 +4,17 @@ #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" +#include <windows.h> #include <lmcons.h> #include <shellapi.h> #include <shlobj.h> #include <strsafe.h> #include <userenv.h> -#include <windows.h> #include <winspool.h> #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/process.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc index a4b2e0c..d6b4782 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" + #include <winspool.h> -#include "base/file_util.h" + +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string16.h" #include "base/win/registry.h" diff --git a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc index 26a2bdf..0f31afa 100644 --- a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc +++ b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc @@ -7,7 +7,7 @@ #include <windows.h> #include <winspool.h> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string16.h" #include "base/win/windows_version.h" |