chrome/browser/media/native_desktop_media_list.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Unified Diff: chrome/browser/media/native_desktop_media_list.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/media/midi_permission_infobar_delegate.cc ('k') | chrome/browser/media/protected_media_identifier_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/native_desktop_media_list.cc

diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc

index ad3cbce197c0044dfa8e2d987f2b7d2525ff7f5c..6b5eeaa9651d1a1f8463ce1af7186efa0ddf5684 100644

--- a/chrome/browser/media/native_desktop_media_list.cc

+++ b/chrome/browser/media/native_desktop_media_list.cc

@@ -13,8 +13,8 @@

#include "base/strings/utf_string_conversions.h"

#include "base/threading/sequenced_worker_pool.h"

#include "chrome/browser/media/desktop_media_list_observer.h"

+#include "chrome/grit/generated_resources.h"

#include "content/public/browser/browser_thread.h"

-#include "grit/generated_resources.h"

#include "media/base/video_util.h"

#include "third_party/libyuv/include/libyuv/scale_argb.h"

#include "third_party/skia/include/core/SkBitmap.h"