chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 680383008: Move ash/ime to ui/chromeos/ime

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 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command

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

« no previous file with comments | « chrome/browser/chromeos/input_method/mode_indicator_controller.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | ui/base/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ff2f066e71ecf56d1fe70157ec202f926f898808..8c419c38521d06cdff4995ff1f10d0093643952e 100644

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

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

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

#include <vector>

-#include "ash/ime/input_method_menu_manager.h"

#include "ash/session/session_state_observer.h"

#include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"

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

@@ -36,6 +35,7 @@

#include "device/bluetooth/bluetooth_adapter.h"

#include "device/bluetooth/bluetooth_discovery_session.h"

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

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

namespace user_manager {

class User;

@@ -44,7 +44,7 @@ class User;

namespace chromeos {

class SystemTrayDelegateChromeOS

- : public ash::ime::InputMethodMenuManager::Observer,

+ : public ui::ime::InputMethodMenuManager::Observer,

public ash::SystemTrayDelegate,

public SessionManagerClient::Observer,

public content::NotificationObserver,

@@ -204,7 +204,7 @@ class SystemTrayDelegateChromeOS

// Overridden from InputMethodMenuManager::Observer.

void InputMethodMenuItemChanged(

- ash::ime::InputMethodMenuManager* manager) override;

+ ui::ime::InputMethodMenuManager* manager) override;

// Overridden from CrasAudioHandler::AudioObserver.

void OnOutputVolumeChanged() override;