chrome/browser/policy/browser_policy_connector.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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/policy/browser_policy_connector.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (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/browser/policy/browser_policy_connector.cc

diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc

index d24d53b7df3cbfab772d4d84c7925c5417bac92e..ee9636b45e0f15622af566367db5736e5a8aa370 100644

--- a/chrome/browser/policy/browser_policy_connector.cc

+++ b/chrome/browser/policy/browser_policy_connector.cc

@@ -17,7 +17,7 @@

#include "base/prefs/pref_registry_simple.h"

#include "base/prefs/pref_service.h"

#include "base/string_util.h"

-#include "base/utf_string_conversions.h"

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/policy/async_policy_provider.h"

#include "chrome/browser/policy/cloud/cloud_policy_client.h"

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

#endif

#if defined(OS_CHROMEOS)

-#include "base/utf_string_conversions.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/policy/app_pack_updater.h"

« no previous file with comments | « chrome/browser/plugins/plugin_prefs_unittest.cc ('k') | chrome/browser/policy/configuration_policy_pref_store.cc » ('j') | no next file with comments »