diff options
| author | thakis <thakis@chromium.org> | 2014-11-05 21:09:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-06 05:09:41 +0000 |
| commit | 6601f743be864cd37bf55c7c8643f21c2eeb7ffe (patch) | |
| tree | 57074fbd7a6115f03faba48852248b4529e0431d /win8 | |
| parent | 510ed8e880ae17f79a84c2ed3bc1a87300a83119 (diff) | |
| download | chromium_src-6601f743be864cd37bf55c7c8643f21c2eeb7ffe.zip chromium_src-6601f743be864cd37bf55c7c8643f21c2eeb7ffe.tar.gz chromium_src-6601f743be864cd37bf55c7c8643f21c2eeb7ffe.tar.bz2 | |
Do not use vector<scoped_ptr<>>.
It requires library support so that vector knows about move-only types. This
is a C++11 library feature, and these aren't allowed yet as they don't work
on all platforms yet.
BUG=none
Review URL: https://codereview.chromium.org/700723004
Cr-Commit-Position: refs/heads/master@{#302964}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/print_document_source.cc | 2 | ||||
| -rw-r--r-- | win8/metro_driver/print_document_source.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/win8/metro_driver/print_document_source.cc b/win8/metro_driver/print_document_source.cc index 34ce227..9d2a0c4 100644 --- a/win8/metro_driver/print_document_source.cc +++ b/win8/metro_driver/print_document_source.cc @@ -393,7 +393,7 @@ void PrintDocumentSource::SetPageCount(size_t page_count) { pages_ready_state_.resize(page_count); for (size_t i = 0; i < page_count; ++i) - pages_ready_state_[i].reset(new base::ConditionVariable(parent_lock_)); + pages_ready_state_[i] = new base::ConditionVariable(parent_lock_); } page_count_ready_.Signal(); } diff --git a/win8/metro_driver/print_document_source.h b/win8/metro_driver/print_document_source.h index fed333e..fbd3c17 100644 --- a/win8/metro_driver/print_document_source.h +++ b/win8/metro_driver/print_document_source.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_vector.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/waitable_event.h" #include "win8/metro_driver/winrt_utils.h" @@ -125,7 +125,7 @@ class PrintDocumentSource // variable in this vector is signaled. This is only filled when we receive // the page count, so we must wait on page_count_ready_ before accessing // the content of this vector. - std::vector<scoped_ptr<base::ConditionVariable> > pages_ready_state_; + ScopedVector<base::ConditionVariable> pages_ready_state_; // This event is signaled when we receive a page count from Chrome. We should // not receive any page data before the count, so we can check this event |