ash/common/system/chromeos/ime_menu/ime_menu_tray.h - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

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.h

Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (Closed)

Patch Set: Created 3 years, 9 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.h

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

similarity index 88%

rename from ash/system/ime_menu/ime_menu_tray.h

rename to ash/common/system/chromeos/ime_menu/ime_menu_tray.h

index 278a102cf8f1ed2eca32f989684af3082099f5dc..0c8355290405b525ed138399233834934ed5b904 100644

--- a/ash/system/ime_menu/ime_menu_tray.h

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

@@ -2,15 +2,15 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_

-#define ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_

+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_

+#define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_

#include "ash/ash_export.h"

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

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

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

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

-#include "ash/system/virtual_keyboard/virtual_keyboard_observer.h"

+#include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"

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

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

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

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

#include "base/macros.h"

#include "ui/keyboard/keyboard_controller_observer.h"

#include "ui/views/bubble/tray_bubble_view.h"

@@ -115,4 +115,4 @@ class ASH_EXPORT ImeMenuTray : public TrayBackgroundView,

} // namespace ash

-#endif // ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_

+#endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_