ash/common/system/ime/tray_ime_chromeos.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget 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/common/system/ime/tray_ime_chromeos.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: cleanup test Created 4 years, 5 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/common/system/ime/tray_ime_chromeos.cc

diff --git a/ash/common/system/ime/tray_ime_chromeos.cc b/ash/common/system/ime/tray_ime_chromeos.cc

index 32d448c4f8b7ae6035678a98a4f3c5d1d1ff5079..f0f08ded0d5250f0dd71674775445294787ff8c0 100644

--- a/ash/common/system/ime/tray_ime_chromeos.cc

+++ b/ash/common/system/ime/tray_ime_chromeos.cc

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

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/system/tray/hover_highlight_view.h"

+#include "ash/common/system/tray/system_tray.h"

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/system/tray/system_tray_notifier.h"

#include "ash/common/system/tray/tray_constants.h"

@@ -17,7 +18,6 @@

#include "ash/common/system/tray/tray_utils.h"

#include "ash/common/system/tray_accessibility.h"

#include "ash/common/wm_shell.h"

-#include "ash/system/tray/system_tray.h"

#include "base/logging.h"

#include "base/strings/utf_string_conversions.h"

#include "grit/ash_resources.h"

« no previous file with comments | « ash/common/system/date/tray_date.cc ('k') | ash/common/system/status_area_widget.h » ('j') | ash/common/system/tray/system_tray_unittest.cc » ('J')