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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.h

Issue 2274013003: Keeps the opt-in IME menu in lock screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sate menu_activated in StateImpl. Created 4 years, 4 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/chromeos/input_method/input_method_manager_impl.h
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index 64d16a9673070cd76232d3768f0ec6e6e995c185..b07971231082aa68ee8eb7fd73e6133f1e67cf8a 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -136,6 +136,9 @@ class InputMethodManagerImpl : public InputMethodManager,
InputMethodManagerImpl* const manager_;
+ // True if the opt-in IME menu is activated.
+ bool menu_activated;
+
protected:
friend base::RefCounted<chromeos::input_method::InputMethodManager::State>;
~StateImpl() override;
@@ -171,6 +174,7 @@ class InputMethodManagerImpl : public InputMethodManager,
void NotifyImeMenuItemsChanged(
const std::string& engine_id,
const std::vector<InputMethodManager::MenuItem>& items) override;
+ void MaybeNotifyImeMenuActivationChanged() override;
// chromeos::UserAddingScreen:
void OnUserAddingStarted() override;
@@ -284,14 +288,14 @@ class InputMethodManagerImpl : public InputMethodManager,
// Whether load IME extensions.
bool enable_extension_loading_;
- // Whether the expanded IME menu is activated.
- bool is_ime_menu_activated_;
-
// The engine map from extension_id to an engine.
typedef std::map<std::string, ui::IMEEngineHandlerInterface*> EngineMap;
typedef std::map<Profile*, EngineMap, ProfileCompare> ProfileEngineMap;
ProfileEngineMap engine_map_;
+ // True if the opt-in IME menu is activated.
+ bool menu_activated_;
Shu Chen 2016/08/29 08:20:08 maybe revert this rename change?
Azure Wei 2016/08/29 08:27:47 Done.
+
DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
};

Powered by Google App Engine
This is Rietveld 408576698