Platform agnostically rename PrinterStatus and PrinterQueryResult files

crrev.com/752905 moved the definition of PrinterStatus out of cups_jobs.h, and named the new file with the assumption that it will only be built on ChromeOS. Given that CUPS IPP will be supported on macOS in the near future, this naming was not appropriate. Do the same thing with PrinterQueryResult. Bug: 226176 Change-Id: I54e99b63f40221a832ab95196c8c9c14ba7f2011 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121081 Commit-Queue: Daniel Hosseinian <dhoss@chromium.org> Reviewed-by: Bailey Berro <baileyberro@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/master@{#753472}
Denger-Network · Mar 26, 2020 · 86d0cca · 86d0cca
1 parent a5a9cd3
commit 86d0cca
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/chrome/browser/chromeos/printing/printer_error_codes.cc b/chrome/browser/chromeos/printing/printer_error_codes.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/printing/printer_error_codes.h"
 
 #include "printing/backend/cups_jobs.h"
-#include "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 
 namespace chromeos {
 

diff --git a/chrome/browser/chromeos/printing/printer_info.h b/chrome/browser/chromeos/printing/printer_info.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/callback_forward.h"
-#include "printing/printer_query_result_chromeos.h"
+#include "printing/printer_query_result.h"
 
 namespace printing {
 struct PrinterStatus;

diff --git a/chrome/browser/chromeos/printing/printer_info_cups.cc b/chrome/browser/chromeos/printing/printer_info_cups.cc
@@ -18,7 +18,7 @@
 #include "base/version.h"
 #include "chrome/browser/chromeos/printing/printer_info.h"
 #include "printing/backend/cups_jobs.h"
-#include "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 
 namespace {
 

diff --git a/chrome/browser/chromeos/printing/printer_info_stub.cc b/chrome/browser/chromeos/printing/printer_info_stub.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/task/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 
 namespace chromeos {
 

diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
@@ -59,7 +59,7 @@
 #include "net/base/ip_endpoint.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "printing/backend/print_backend.h"
-#include "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 #include "url/gurl.h"
 
 namespace chromeos {

diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
@@ -18,7 +18,7 @@
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "chromeos/printing/ppd_provider.h"
 #include "chromeos/printing/printer_configuration.h"
-#include "printing/printer_query_result_chromeos.h"
+#include "printing/printer_query_result.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace base {

diff --git a/printing/BUILD.gn b/printing/BUILD.gn
@@ -236,9 +236,9 @@ component("printing") {
       "backend/printing_restrictions.cc",
       "backend/printing_restrictions.h",
       "printed_document_chromeos.cc",
-      "printer_query_result_chromeos.h",
-      "printer_status_chromeos.cc",
-      "printer_status_chromeos.h",
+      "printer_query_result.h",
+      "printer_status.cc",
+      "printer_status.h",
       "printing_context_no_system_dialog.cc",
       "printing_context_no_system_dialog.h",
     ]

diff --git a/printing/backend/cups_connection.h b/printing/backend/cups_connection.h
@@ -16,7 +16,7 @@
 #include "printing/backend/cups_deleters.h"
 #include "printing/backend/cups_jobs.h"
 #include "printing/backend/cups_printer.h"
-#include "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 #include "printing/printing_export.h"
 #include "url/gurl.h"
 

diff --git a/printing/backend/cups_jobs.cc b/printing/backend/cups_jobs.cc
@@ -18,7 +18,7 @@
 #include "base/version.h"
 #include "printing/backend/cups_deleters.h"
 #include "printing/backend/cups_ipp_helper.h"
-#include "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 
 namespace printing {
 namespace {

diff --git a/printing/backend/cups_jobs.h b/printing/backend/cups_jobs.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "base/version.h"
-#include "printing/printer_query_result_chromeos.h"
+#include "printing/printer_query_result.h"
 #include "printing/printing_export.h"
 
 // This file contains a collection of functions used to query IPP printers or

diff --git a/printing/printer_query_result_chromeos.h → printing/printer_query_result.h b/printing/printer_query_result_chromeos.h → printing/printer_query_result.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PRINTER_QUERY_RESULT_CHROMEOS_H_
-#define PRINTING_PRINTER_QUERY_RESULT_CHROMEOS_H_
+#ifndef PRINTING_PRINTER_QUERY_RESULT_H_
+#define PRINTING_PRINTER_QUERY_RESULT_H_
 
 #include "printing/printing_export.h"
 
@@ -18,4 +18,4 @@ enum PRINTING_EXPORT PrinterQueryResult {
 
 }  // namespace printing
 
-#endif  // PRINTING_PRINTER_QUERY_RESULT_CHROMEOS_H_
+#endif  // PRINTING_PRINTER_QUERY_RESULT_H_
diff --git a/printing/printer_status_chromeos.cc → printing/printer_status.cc b/printing/printer_status_chromeos.cc → printing/printer_status.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 "printing/printer_status_chromeos.h"
+#include "printing/printer_status.h"
 
 namespace printing {
 

diff --git a/printing/printer_status_chromeos.h → printing/printer_status.h b/printing/printer_status_chromeos.h → printing/printer_status.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PRINTER_STATUS_CHROMEOS_H_
-#define PRINTING_PRINTER_STATUS_CHROMEOS_H_
+#ifndef PRINTING_PRINTER_STATUS_H_
+#define PRINTING_PRINTER_STATUS_H_
 
 #include <cups/cups.h>
 
@@ -77,4 +77,4 @@ struct PRINTING_EXPORT PrinterStatus {
 
 }  // namespace printing
 
-#endif  // PRINTING_PRINTER_STATUS_CHROMEOS_H_
+#endif  // PRINTING_PRINTER_STATUS_H_