diff options
author | brettw <brettw@chromium.org> | 2015-05-29 15:15:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 22:16:36 +0000 |
commit | d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77 (patch) | |
tree | 5e571190738d8545b83558db29f4856afbf53556 /printing | |
parent | e124019512f944ad49114dea310531418d53ff7e (diff) | |
download | chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.zip chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.tar.gz chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.tar.bz2 |
Move Tuple to base namespace.
Namespace change only, no functionality change.
The only non-search-and-replace change is in generate_gmock_mutant.py which changes some line wrapping logic for the generated gmock_mutant header.
NOPRESUBMIT=true
(No presubmit due to long lines in the generated gmock_mutant.h header).
R=sky
Review URL: https://codereview.chromium.org/1159553007
Cr-Commit-Position: refs/heads/master@{#332058}
Diffstat (limited to 'printing')
-rw-r--r-- | printing/pdf_render_settings.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/printing/pdf_render_settings.h b/printing/pdf_render_settings.h index 85bf00e..3f8f38b 100644 --- a/printing/pdf_render_settings.h +++ b/printing/pdf_render_settings.h @@ -16,7 +16,7 @@ namespace printing { // gfx::Rect - render area // int - render dpi // bool - autorotate pages to fit paper -typedef Tuple<gfx::Rect, int, bool> PdfRenderSettingsBase; +typedef base::Tuple<gfx::Rect, int, bool> PdfRenderSettingsBase; class PdfRenderSettings : public PdfRenderSettingsBase { public: @@ -25,9 +25,9 @@ class PdfRenderSettings : public PdfRenderSettingsBase { : PdfRenderSettingsBase(area, dpi, autorotate) {} ~PdfRenderSettings() {} - const gfx::Rect& area() const { return ::get<0>(*this); } - int dpi() const { return ::get<1>(*this); } - bool autorotate() const { return ::get<2>(*this); } + const gfx::Rect& area() const { return base::get<0>(*this); } + int dpi() const { return base::get<1>(*this); } + bool autorotate() const { return base::get<2>(*this); } }; } // namespace printing |