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

Side by Side Diff: chromecast/media/cma/pipeline/audio_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
« no previous file with comments | « no previous file | chromecast/media/cma/pipeline/av_pipeline_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_AUDIO_PIPELINE_IMPL_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_BASE_AUDIO_PIPELINE_IMPL_H_
6 #define CHROMECAST_MEDIA_CMA_BASE_AUDIO_PIPELINE_IMPL_H_ 6 #define CHROMECAST_MEDIA_CMA_BASE_AUDIO_PIPELINE_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void OnUpdateConfig(const ::media::AudioDecoderConfig& audio_config, 60 void OnUpdateConfig(const ::media::AudioDecoderConfig& audio_config,
61 const ::media::VideoDecoderConfig& video_config); 61 const ::media::VideoDecoderConfig& video_config);
62 62
63 AudioPipelineDevice* audio_device_; 63 AudioPipelineDevice* audio_device_;
64 64
65 scoped_ptr<AvPipelineImpl> av_pipeline_impl_; 65 scoped_ptr<AvPipelineImpl> av_pipeline_impl_;
66 AvPipelineClient audio_client_; 66 AvPipelineClient audio_client_;
67 67
68 ::media::PipelineStatistics previous_stats_; 68 ::media::PipelineStatistics previous_stats_;
69 69
70 base::WeakPtr<AudioPipelineImpl> weak_this_;
70 base::WeakPtrFactory<AudioPipelineImpl> weak_factory_; 71 base::WeakPtrFactory<AudioPipelineImpl> weak_factory_;
71 base::WeakPtr<AudioPipelineImpl> weak_this_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(AudioPipelineImpl); 73 DISALLOW_COPY_AND_ASSIGN(AudioPipelineImpl);
74 }; 74 };
75 75
76 } // namespace media 76 } // namespace media
77 } // namespace chromecast 77 } // namespace chromecast
78 78
79 #endif // CHROMECAST_MEDIA_CMA_BASE_AUDIO_PIPELINE_IMPL_H_ 79 #endif // CHROMECAST_MEDIA_CMA_BASE_AUDIO_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chromecast/media/cma/pipeline/av_pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698