ash/common/system/chromeos/ime_menu/ime_menu_tray.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

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/chromeos/ime_menu/ime_menu_tray.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 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:

Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

index a4542807b7c5283bda602694df1e9955eb762b65..909ffbf7febfe1e17da295112fb6aa90c9808625 100644

--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

@@ -9,7 +9,6 @@

#include "ash/common/material_design/material_design_controller.h"

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

#include "ash/common/shelf/wm_shelf_util.h"

-#include "ash/common/shell_window_ids.h"

#include "ash/common/system/chromeos/ime_menu/ime_list_view.h"

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

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

@@ -24,6 +23,7 @@

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

+#include "ash/public/cpp/shell_window_ids.h"

#include "ash/resources/vector_icons/vector_icons.h"

#include "base/strings/utf_string_conversions.h"

#include "grit/ash_resources.h"