content/browser/web_contents/web_contents_view_aura.cc - Issue 16415016: Move nullable_string16.h to the string subdirectory.

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_contents_view_aura.cc

Issue 16415016: Move nullable_string16.h to the string subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: moar Created 7 years, 6 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_contents_view_aura.cc

diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc

index dedc81c1accbfe4088815de0068480c21894d751..20a1ef6956eb8d7704503708635233fcfe94a8f0 100644

--- a/content/browser/web_contents/web_contents_view_aura.cc

+++ b/content/browser/web_contents/web_contents_view_aura.cc

@@ -262,7 +262,7 @@ void PrepareWebDropData(WebDropData* drop_data,

string16 plain_text;

data.GetString(&plain_text);

if (!plain_text.empty())

- drop_data->text = NullableString16(plain_text, false);

+ drop_data->text = base::NullableString16(plain_text, false);

GURL url;

string16 url_title;

@@ -276,7 +276,7 @@ void PrepareWebDropData(WebDropData* drop_data,

GURL html_base_url;

data.GetHtml(&html, &html_base_url);

if (!html.empty())

- drop_data->html = NullableString16(html, false);

+ drop_data->html = base::NullableString16(html, false);

if (html_base_url.is_valid())

drop_data->html_base_url = html_base_url;