Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(866)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 150203015: Split out InputMethodMenuManager from InputMethodManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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: 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 c31a596db644b47c270fb57df060df0f3fedb58c..e92844eca903ae609862c7ece7ebfc8c7cdcc133 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
#define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
+#include "ash/ime/input_method_menu_manager.h"
#include "ash/session_state_observer.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -30,7 +31,8 @@
namespace chromeos {
class SystemTrayDelegateChromeOS
- : public ash::SystemTrayDelegate,
+ : public ash::ime::InputMethodMenuManager::Observer,
+ public ash::SystemTrayDelegate,
public SessionManagerClient::Observer,
public drive::JobListObserver,
public content::NotificationObserver,
@@ -179,8 +181,9 @@ class SystemTrayDelegateChromeOS
virtual void InputMethodChanged(input_method::InputMethodManager* manager,
bool show_message) OVERRIDE;
- virtual void InputMethodPropertyChanged(
- input_method::InputMethodManager* manager) OVERRIDE;
+ // Overridden from InputMethodMenuManager::Observer.
+ virtual void InputMethodMenuItemChanged(
+ ash::ime::InputMethodMenuManager* manager) OVERRIDE;
// drive::JobListObserver overrides.
virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698