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

Side by Side Diff: chromecast/media/cma/pipeline/av_pipeline_impl.h

Issue 857573004: Fix chromium-style errors for WeakPtrFactory member order in Chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_
6 #define CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_ 6 #define CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 // The media time is retrieved at regular intervals. 154 // The media time is retrieved at regular intervals.
155 // Indicate whether time update is enabled. 155 // Indicate whether time update is enabled.
156 bool enable_time_update_; 156 bool enable_time_update_;
157 bool pending_time_update_task_; 157 bool pending_time_update_task_;
158 158
159 // Decryption keys, if available. 159 // Decryption keys, if available.
160 BrowserCdmCast* media_keys_; 160 BrowserCdmCast* media_keys_;
161 int media_keys_callback_id_; 161 int media_keys_callback_id_;
162 162
163 base::WeakPtr<AvPipelineImpl> weak_this_;
163 base::WeakPtrFactory<AvPipelineImpl> weak_factory_; 164 base::WeakPtrFactory<AvPipelineImpl> weak_factory_;
164 base::WeakPtr<AvPipelineImpl> weak_this_;
165 165
166 DISALLOW_COPY_AND_ASSIGN(AvPipelineImpl); 166 DISALLOW_COPY_AND_ASSIGN(AvPipelineImpl);
167 }; 167 };
168 168
169 } // namespace media 169 } // namespace media
170 } // namespace chromecast 170 } // namespace chromecast
171 171
172 #endif // CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_ 172 #endif // CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « chromecast/media/cma/pipeline/audio_pipeline_impl.h ('k') | chromecast/media/cma/pipeline/media_pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698