summaryrefslogtreecommitdiffstats
path: root/cloud_print/virtual_driver/win
diff options
context:
space:
mode:
Diffstat (limited to 'cloud_print/virtual_driver/win')
-rw-r--r--cloud_print/virtual_driver/win/install/setup.cc8
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor.cc6
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor.h2
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc4
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc4
-rw-r--r--cloud_print/virtual_driver/win/virtual_driver_helpers.cc2
6 files changed, 14 insertions, 12 deletions
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"