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

Side by Side Diff: chromecast/media/cma/pipeline/media_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_PIPELINE_MEDIA_PIPELINE_IMPL_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_IMPL_H_
6 #define CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_IMPL_H_ 6 #define CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // The media time is retrieved at regular intervals. 93 // The media time is retrieved at regular intervals.
94 // Indicate whether time update is enabled. 94 // Indicate whether time update is enabled.
95 bool enable_time_update_; 95 bool enable_time_update_;
96 bool pending_time_update_task_; 96 bool pending_time_update_task_;
97 base::TimeDelta last_media_time_; 97 base::TimeDelta last_media_time_;
98 98
99 // Used to make the statistics update period a multiplier of the time update 99 // Used to make the statistics update period a multiplier of the time update
100 // period. 100 // period.
101 int statistics_rolling_counter_; 101 int statistics_rolling_counter_;
102 102
103 base::WeakPtr<MediaPipelineImpl> weak_this_;
103 base::WeakPtrFactory<MediaPipelineImpl> weak_factory_; 104 base::WeakPtrFactory<MediaPipelineImpl> weak_factory_;
104 base::WeakPtr<MediaPipelineImpl> weak_this_;
105 105
106 DISALLOW_COPY_AND_ASSIGN(MediaPipelineImpl); 106 DISALLOW_COPY_AND_ASSIGN(MediaPipelineImpl);
107 }; 107 };
108 108
109 } // namespace media 109 } // namespace media
110 } // namespace chromecast 110 } // namespace chromecast
111 111
112 #endif // CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_IMPL_H_ 112 #endif // CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « chromecast/media/cma/pipeline/av_pipeline_impl.h ('k') | chromecast/media/cma/pipeline/video_pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698