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

Side by Side Diff: media/remoting/interstitial.cc

Issue 2656523002: Rename media_resources -> localized_strings (Closed)
Patch Set: rebase Created 3 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 | « media/base/media_resources.cc ('k') | media/test/run_all_unittests.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/remoting/interstitial.h" 5 #include "media/remoting/interstitial.h"
6 6
7 #include <algorithm> // for std::max() 7 #include <algorithm> // for std::max()
8 8
9 #include "media/base/media_resources.h" 9 #include "media/base/localized_strings.h"
10 #include "media/base/video_frame.h" 10 #include "media/base/video_frame.h"
11 #include "media/base/video_renderer_sink.h" 11 #include "media/base/video_renderer_sink.h"
12 #include "media/base/video_util.h" 12 #include "media/base/video_util.h"
13 #include "skia/ext/image_operations.h" 13 #include "skia/ext/image_operations.h"
14 #include "third_party/skia/include/core/SkBitmap.h" 14 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "third_party/skia/include/core/SkCanvas.h" 15 #include "third_party/skia/include/core/SkCanvas.h"
16 #include "third_party/skia/include/core/SkTypeface.h" 16 #include "third_party/skia/include/core/SkTypeface.h"
17 #include "third_party/skia/include/effects/SkBlurImageFilter.h" 17 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
18 #include "ui/gfx/color_palette.h" 18 #include "ui/gfx/color_palette.h"
19 #include "ui/gfx/geometry/size.h" 19 #include "ui/gfx/geometry/size.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 return; 168 return;
169 169
170 const scoped_refptr<VideoFrame> interstitial = 170 const scoped_refptr<VideoFrame> interstitial =
171 RenderInterstitialFrame(image, natural_size, interstitial_type); 171 RenderInterstitialFrame(image, natural_size, interstitial_type);
172 172
173 video_renderer_sink->PaintSingleFrame(interstitial); 173 video_renderer_sink->PaintSingleFrame(interstitial);
174 } 174 }
175 175
176 } // namespace remoting 176 } // namespace remoting
177 } // namespace media 177 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media_resources.cc ('k') | media/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698