ash/system/tray/system_tray.cc - Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common

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/tray/system_tray.cc

Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movea11y

Patch Set: nit Created 4 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/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index 7340690f1f4143d4feeed9a2fb3ad84ab7f27ab4..e5e0fdf0a2c89c1ac2d7b7435e1fcbf384bef624 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

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

#include "ash/common/system/chromeos/power/power_status.h"

#include "ash/common/system/chromeos/power/tray_power.h"

#include "ash/common/system/chromeos/settings/tray_settings.h"

+#include "ash/common/system/ime/tray_ime_chromeos.h"

#include "ash/system/chromeos/audio/tray_audio_chromeos.h"

#include "ash/system/chromeos/bluetooth/tray_bluetooth.h"

#include "ash/system/chromeos/brightness/tray_brightness.h"

@@ -63,7 +64,6 @@

#include "ash/system/chromeos/tray_caps_lock.h"

#include "ash/system/chromeos/tray_display.h"

#include "ash/system/chromeos/tray_tracing.h"

-#include "ash/system/ime/tray_ime_chromeos.h"

#include "ash/system/tray/media_security/multi_profile_media_tray_item.h"

#include "ui/message_center/message_center.h"

#endif

« no previous file with comments | « ash/system/ime/tray_ime_chromeos_unittest.cc ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »