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

Side by Side Diff: printing/page_range.cc

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "printing/page_range.h" 5 #include "printing/page_range.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include <set>
8 #include <vector>
8 9
9 namespace printing { 10 namespace printing {
10 11
11 /* static */ 12 /* static */
12 std::vector<int> PageRange::GetPages(const PageRanges& ranges) { 13 std::vector<int> PageRange::GetPages(const PageRanges& ranges) {
13 std::set<int> pages; 14 std::set<int> pages;
14 for (unsigned i = 0; i < ranges.size(); ++i) { 15 for (unsigned i = 0; i < ranges.size(); ++i) {
15 const PageRange& range = ranges[i]; 16 const PageRange& range = ranges[i];
16 // Ranges are inclusive. 17 // Ranges are inclusive.
17 for (int i = range.from; i <= range.to; ++i) { 18 for (int i = range.from; i <= range.to; ++i) {
18 pages.insert(i); 19 pages.insert(i);
19 } 20 }
20 } 21 }
21 return SetToVector(pages); 22 return std::vector<int>(pages.begin(), pages.end());
22 } 23 }
23 24
24 /* static */ 25 /* static */
25 int PageRange::GetTotalPages(const PageRanges& ranges) { 26 int PageRange::GetTotalPages(const PageRanges& ranges) {
26 // Since ranges can overlap we need to merge them before counting 27 // Since ranges can overlap we need to merge them before counting
27 std::vector<int> pages = PageRange::GetPages(ranges); 28 std::vector<int> pages = PageRange::GetPages(ranges);
28 return pages.size(); 29 return pages.size();
29 } 30 }
30 31
31 } // namespace printing 32 } // namespace printing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698