content/browser/web_contents/web_drag_source_mac.mm - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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: content/browser/web_contents/web_drag_source_mac.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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:

Index: content/browser/web_contents/web_drag_source_mac.mm

diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm

index e1944068632c2df0b37a0096dbd8db8a072855d6..1133b7480a7932ff517f80a6ea645d0bdef6dd2d 100644

--- a/content/browser/web_contents/web_drag_source_mac.mm

+++ b/content/browser/web_contents/web_drag_source_mac.mm

@@ -22,7 +22,7 @@

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

#include "content/public/common/content_client.h"

#include "content/public/common/url_constants.h"

-#include "grit/ui_resources_standard.h"

+#include "grit/ui_resources.h"

#include "net/base/escape.h"

#include "net/base/file_stream.h"

#include "net/base/net_util.h"

« no previous file with comments | « content/DEPS ('k') | content/content_browser.gypi » ('j') | no next file with comments »