chrome/browser/ui/webui/options/chromeos/timezone_options_util.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/webui/options/chromeos/timezone_options_util.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/webui/options/chromeos/stats_options_handler.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

index 8fce13db330923b5159130656cdd0fbff1d102ff..215421adce27056572b8a75b99692a3bfe78bdcb 100644

--- a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

+++ b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

@@ -10,8 +10,8 @@

#include "base/lazy_instance.h"

#include "base/string_util.h"

#include "base/stringprintf.h"

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

#include "base/synchronization/lock.h"

-#include "base/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/browser/chromeos/system/timezone_settings.h"

#include "grit/generated_resources.h"