Commit cdcce235 authored by Daniel Hosseinian's avatar Daniel Hosseinian Committed by Commit Bot

Replace DISALLOW_IMPLICIT_CONSTRUCTORS macros in printing/

Replace the deprecated macros with explicit deletions.

Change-Id: Ia6991f4582b98ae535c496bd411caf3928c08c01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2365853
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799924}
parent f259009e
......@@ -19,7 +19,6 @@
#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/free_deleter.h"
#include "base/strings/string16.h"
#include "base/win/scoped_handle.h"
......@@ -32,6 +31,10 @@ struct PRINTING_EXPORT PrinterBasicInfo;
class PRINTING_EXPORT PrinterHandleTraits {
public:
PrinterHandleTraits() = delete;
PrinterHandleTraits(const PrinterHandleTraits&) = delete;
PrinterHandleTraits& operator=(const PrinterHandleTraits&) = delete;
using Handle = HANDLE;
static bool CloseHandle(HANDLE handle);
......@@ -39,9 +42,6 @@ class PRINTING_EXPORT PrinterHandleTraits {
static bool IsHandleValid(HANDLE handle) { return !!handle; }
static HANDLE NullHandle() { return nullptr; }
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(PrinterHandleTraits);
};
class PRINTING_EXPORT ScopedPrinterHandle
......@@ -53,6 +53,11 @@ class PRINTING_EXPORT ScopedPrinterHandle
class PRINTING_EXPORT PrinterChangeHandleTraits {
public:
PrinterChangeHandleTraits() = delete;
PrinterChangeHandleTraits(const PrinterChangeHandleTraits&) = delete;
PrinterChangeHandleTraits& operator=(const PrinterChangeHandleTraits&) =
delete;
using Handle = HANDLE;
static bool CloseHandle(HANDLE handle);
......@@ -60,9 +65,6 @@ class PRINTING_EXPORT PrinterChangeHandleTraits {
static bool IsHandleValid(HANDLE handle) { return !!handle; }
static HANDLE NullHandle() { return nullptr; }
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(PrinterChangeHandleTraits);
};
using ScopedPrinterChangeHandle =
......
......@@ -7,7 +7,6 @@
#import <ApplicationServices/ApplicationServices.h>
#include "base/macros.h"
#include "printing/page_range.h"
namespace printing {
......@@ -17,12 +16,14 @@ class PrintSettings;
// Initializes a PrintSettings object from the provided device context.
class PRINTING_EXPORT PrintSettingsInitializerMac {
public:
PrintSettingsInitializerMac() = delete;
PrintSettingsInitializerMac(const PrintSettingsInitializerMac&) = delete;
PrintSettingsInitializerMac& operator=(const PrintSettingsInitializerMac&) =
delete;
static void InitPrintSettings(PMPrinter printer,
PMPageFormat page_format,
PrintSettings* print_settings);
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(PrintSettingsInitializerMac);
};
} // namespace printing
......
......@@ -7,7 +7,6 @@
#include <string>
#include "base/macros.h"
#include "printing/page_range.h"
typedef struct HDC__* HDC;
......@@ -20,12 +19,14 @@ class PrintSettings;
// Initializes a PrintSettings object from the provided device context.
class PRINTING_EXPORT PrintSettingsInitializerWin {
public:
PrintSettingsInitializerWin() = delete;
PrintSettingsInitializerWin(const PrintSettingsInitializerWin&) = delete;
PrintSettingsInitializerWin& operator=(const PrintSettingsInitializerWin&) =
delete;
static void InitPrintSettings(HDC hdc,
const DEVMODE& dev_mode,
PrintSettings* print_settings);
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(PrintSettingsInitializerWin);
};
} // namespace printing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment