ash/system/monitor/tray_monitor.cc - Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/.

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: ash/system/monitor/tray_monitor.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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: ash/system/monitor/tray_monitor.cc

diff --git a/ash/system/monitor/tray_monitor.cc b/ash/system/monitor/tray_monitor.cc

index cc46b0f0e98d397a3efd2925b2ad32c8f4c0ff24..69d1e0a36dbb968544cf45e1657cbcb151dca343 100644

--- a/ash/system/monitor/tray_monitor.cc

+++ b/ash/system/monitor/tray_monitor.cc

@@ -7,11 +7,11 @@

#include "ash/system/tray/tray_item_view.h"

#include "base/process_util.h"

#include "base/stringprintf.h"

-#include "base/utf_string_conversions.h"

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

#include "content/public/browser/gpu_data_manager.h"

#include "ui/base/text/bytes_formatting.h"

-#include "ui/views/controls/label.h"

#include "ui/views/border.h"

+#include "ui/views/controls/label.h"

namespace {

const int kRefreshTimeoutMs = 1000;

« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/session_length_limit/tray_session_length_limit.cc » ('j') | no next file with comments »