chrome_frame/chrome_frame_activex_base.h - Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone…

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_frame/chrome_frame_activex_base.h

Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

View side-by-side diff with in-line comments

Download patch

Index: chrome_frame/chrome_frame_activex_base.h

diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h

index dc749a5520e9bab271dcff775b56f3bfd1a3a72b..42d3e99ba3ebc3f7f65807de64de618eab16f7bd 100644

--- a/chrome_frame/chrome_frame_activex_base.h

+++ b/chrome_frame/chrome_frame_activex_base.h

@@ -20,11 +20,10 @@

#include "base/metrics/histogram.h"

#include "base/string_util.h"

#include "base/stringprintf.h"

-#include "base/utf_string_conversions.h"

+#include "base/strings/utf_string_conversions.h"

#include "base/win/scoped_bstr.h"

#include "base/win/scoped_comptr.h"

#include "base/win/scoped_variant.h"

-#include "grit/chrome_frame_resources.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/common/url_constants.h"

#include "chrome_frame/chrome_frame_plugin.h"

@@ -35,6 +34,7 @@

#include "chrome_frame/urlmon_url_request.h"

#include "chrome_frame/urlmon_url_request_private.h"

#include "chrome_frame/utils.h"

+#include "grit/chrome_frame_resources.h"

#include "grit/generated_resources.h"

#include "net/cookies/cookie_monster.h"

« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/chrome_frame_automation.cc » ('j') | no next file with comments »