media/remoting/remoting_interstitial_ui.cc - Issue 2656523002: Rename media_resources -> localized_strings

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2656523002: Rename media_resources -> localized_strings (Closed)

Patch Set: 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

« media/base/fake_media_localization_resources.h ('K') | « media/base/media_resources.cc ('k') | media/test/run_all_unittests.cc » ('j') | no next file with comments »

OLD	NEW
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/remoting_interstitial_ui.h"	5 #include "media/remoting/remoting_interstitial_ui.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/media_localization_resources.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/SkCanvas.h"	14 #include "third_party/skia/include/core/SkCanvas.h"

15 #include "third_party/skia/include/core/SkTypeface.h"	15 #include "third_party/skia/include/core/SkTypeface.h"

16 #include "third_party/skia/include/effects/SkBlurImageFilter.h"	16 #include "third_party/skia/include/effects/SkBlurImageFilter.h"

17 #include "ui/gfx/color_palette.h"	17 #include "ui/gfx/color_palette.h"

18 #include "ui/gfx/geometry/size.h"	18 #include "ui/gfx/geometry/size.h"

19 #include "ui/gfx/paint_vector_icon.h"	19 #include "ui/gfx/paint_vector_icon.h"

(...skipping 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 if (!video_renderer_sink)	165 if (!video_renderer_sink)

166 return;	166 return;

167	167

168 const scoped_refptr<VideoFrame> interstitial =	168 const scoped_refptr<VideoFrame> interstitial =

169 RenderInterstitialFrame(image, natural_size, interstitial_type);	169 RenderInterstitialFrame(image, natural_size, interstitial_type);

170	170

171 video_renderer_sink->PaintSingleFrame(interstitial);	171 video_renderer_sink->PaintSingleFrame(interstitial);

172 }	172 }

173	173

174 } // namespace media	174 } // namespace media

OLD	NEW