chrome/browser/ui/toolbar/encoding_menu_controller.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/ui/toolbar/encoding_menu_controller.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (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

« no previous file with comments | « chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc ('k') | chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/encoding_menu_controller.cc

diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc

index 05d87616b1f17fccf0b82467f5576b10b861535c..ddaedb729379fdb718a18f6dabf74bc79d3de91f 100644

--- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc

+++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc

@@ -6,7 +6,7 @@

#include "base/i18n/rtl.h"

#include "base/prefs/pref_service.h"

-#include "base/utf_string_conversions.h"

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

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/character_encoding.h"