Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2572)

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 01b03b9f202efdabc1f6ac923a9cc3294b97a635..28d5eb3a2f32ef41dad32995f45dc6bd4b9cd440 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -74,7 +74,7 @@
#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
#endif
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
#include "chrome/browser/local_discovery/privet_constants.h"
#endif
@@ -535,9 +535,9 @@ void PrintPreviewHandler::RegisterMessages() {
}
bool PrintPreviewHandler::PrivetPrintingEnabled() {
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
return !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableDeviceDiscovery);
+ switches::kDisableDeviceDiscovery);
#else
return false;
#endif
@@ -559,7 +559,7 @@ void PrintPreviewHandler::HandleGetPrinters(const base::ListValue* /*args*/) {
}
void PrintPreviewHandler::HandleGetPrivetPrinters(const base::ListValue* args) {
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
if (PrivetPrintingEnabled()) {
Profile* profile = Profile::FromWebUI(web_ui());
service_discovery_client_ =
@@ -579,7 +579,7 @@ void PrintPreviewHandler::HandleGetPrivetPrinters(const base::ListValue* args) {
void PrintPreviewHandler::HandleStopGetPrivetPrinters(
const base::ListValue* args) {
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
if (PrivetPrintingEnabled()) {
printer_lister_->Stop();
}
@@ -588,7 +588,7 @@ void PrintPreviewHandler::HandleStopGetPrivetPrinters(
void PrintPreviewHandler::HandleGetPrivetPrinterCapabilities(
const base::ListValue* args) {
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
std::string name;
bool success = args->GetString(0, &name);
DCHECK(success);
@@ -718,7 +718,7 @@ void PrintPreviewHandler::HandlePrint(const base::ListValue* args) {
return;
}
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
if (print_with_privet && PrivetPrintingEnabled()) {
std::string printer_name;
std::string print_ticket;
@@ -1350,8 +1350,7 @@ void PrintPreviewHandler::ConvertColorSettingToCUPSColorModel(
#endif
-
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
void PrintPreviewHandler::LocalPrinterChanged(
bool added,
const std::string& name,
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698