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

Unified Diff: chrome/browser/chromeos/events/event_rewriter.cc

Issue 2163223004: ash: Remove WindowState::top_row_keys_are_function_keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « ash/common/wm/window_state.cc ('k') | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/events/event_rewriter.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index f129a04bfc71854e573951752311f52f9795fb75..1e8c6587b0f753a3ced4cb8103b092210339caab 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -10,7 +10,6 @@
#include "ash/common/wm/window_state.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
-#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
#include "base/logging.h"
@@ -425,12 +424,8 @@ bool EventRewriter::IsLastKeyboardOfType(DeviceType device_type) const {
bool EventRewriter::TopRowKeysAreFunctionKeys(const ui::KeyEvent& event) const {
const PrefService* prefs = GetPrefService();
- if (prefs && prefs->FindPreference(prefs::kLanguageSendFunctionKeys) &&
- prefs->GetBoolean(prefs::kLanguageSendFunctionKeys))
- return true;
-
- ash::wm::WindowState* state = ash::wm::GetActiveWindowState();
- return state ? state->top_row_keys_are_function_keys() : false;
+ return prefs && prefs->FindPreference(prefs::kLanguageSendFunctionKeys) &&
+ prefs->GetBoolean(prefs::kLanguageSendFunctionKeys);
}
int EventRewriter::GetRemappedModifierMasks(const PrefService& pref_service,
« no previous file with comments | « ash/common/wm/window_state.cc ('k') | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698