chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

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: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

index 4593e580eb82252cda6269710c4f13cdbaa75d8a..a780fe2873c032906dc4f96c02c1462b3cba86da 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

@@ -26,6 +26,7 @@

#include "chrome/browser/ui/browser_list_observer.h"

#include "chromeos/audio/cras_audio_handler.h"

#include "chromeos/dbus/session_manager_client.h"

+#include "chromeos/ime/input_method_manager.h"

#include "chromeos/login/login_state.h"

#include "components/policy/core/common/cloud/cloud_policy_store.h"

#include "components/user_manager/user_manager.h"

@@ -34,7 +35,6 @@

#include "device/bluetooth/bluetooth_adapter.h"

#include "device/bluetooth/bluetooth_discovery_session.h"

#include "extensions/browser/app_window/app_window_registry.h"

-#include "ui/base/ime/chromeos/input_method_manager.h"

#include "ui/chromeos/ime/input_method_menu_manager.h"

namespace user_manager {

« no previous file with comments | « chrome/browser/ui/ash/ime_controller_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »