summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-04-30 13:07:48 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-30 20:08:19 +0000
commit94b360568b3ea199c64312060a82477661624ea9 (patch)
tree30a88afdc43b2ad399bcdbe6170aa3ffc890b2c2 /printing
parent54877534d26f8ef12c21ce650f1d289f196b2fb5 (diff)
downloadchromium_src-94b360568b3ea199c64312060a82477661624ea9.zip
chromium_src-94b360568b3ea199c64312060a82477661624ea9.tar.gz
chromium_src-94b360568b3ea199c64312060a82477661624ea9.tar.bz2
win: Fix remaining plugin warnings in ash, device, printing, sandbox.
https://www.chromium.org/developers/coding-style/chromium-style-checker-errors BUG=467287 TBR=cpu Review URL: https://codereview.chromium.org/1115293002 Cr-Commit-Position: refs/heads/master@{#327773}
Diffstat (limited to 'printing')
-rw-r--r--printing/emf_win.cc11
-rw-r--r--printing/emf_win.h10
2 files changed, 15 insertions, 6 deletions
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 030d520..2afa1dd 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -246,6 +246,14 @@ gfx::Rect Emf::GetPageBounds(unsigned int page_number) const {
header.rclBounds.bottom - header.rclBounds.top + 1);
}
+unsigned int Emf::GetPageCount() const {
+ return 1;
+}
+
+HDC Emf::context() const {
+ return hdc_;
+}
+
uint32 Emf::GetDataSize() const {
DCHECK(emf_ && !hdc_);
return GetEnhMetaFileBits(emf_, 0, NULL);
@@ -472,6 +480,9 @@ Emf::Enumerator::Enumerator(const Emf& emf, HDC context, const RECT* rect) {
DCHECK_EQ(context_.hdc, context);
}
+Emf::Enumerator::~Enumerator() {
+}
+
Emf::Enumerator::const_iterator Emf::Enumerator::begin() const {
return items_.begin();
}
diff --git a/printing/emf_win.h b/printing/emf_win.h
index e301988..dcdfd8c 100644
--- a/printing/emf_win.h
+++ b/printing/emf_win.h
@@ -74,12 +74,8 @@ class PRINTING_EXPORT Emf : public Metafile {
// Should be passed to Playback to keep the exact same size.
gfx::Rect GetPageBounds(unsigned int page_number) const override;
- unsigned int GetPageCount() const override { return 1; }
-
- HDC context() const override {
- return hdc_;
- }
-
+ unsigned int GetPageCount() const override;
+ HDC context() const override;
bool Playback(HDC hdc, const RECT* rect) const override;
bool SafePlayback(HDC hdc) const override;
@@ -163,6 +159,8 @@ class PRINTING_EXPORT Emf::Enumerator {
// Warning: |emf| must be kept valid for the time this object is alive.
Enumerator(const Emf& emf, HDC hdc, const RECT* rect);
+ ~Enumerator();
+
// Retrieves the first Record.
const_iterator begin() const;