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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/event_rewriter_unittest.cc

Issue 11316163: Remove the last usages of PrefObserver outside of Prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 8 years 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/tab_contents/spelling_menu_observer.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/event_rewriter_unittest.cc
diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc
index efcdd5cd7817a3fa18840a39bb1c2840c367d7b6..a1be752d4bc9fdefe3164272c943a7e2a66e20de 100644
--- a/chrome/browser/ui/ash/event_rewriter_unittest.cc
+++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc
@@ -483,7 +483,7 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControlWithControlRemapped) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kAltKey);
EventRewriter rewriter;
@@ -1083,10 +1083,10 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember search;
- search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+ search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kVoidKey);
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kVoidKey);
EventRewriter rewriter;
@@ -1182,7 +1182,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Remap Alt to Control.
IntegerPrefMember alt;
- alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs, NULL);
+ alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs);
alt.SetValue(chromeos::input_method::kControlKey);
// Press left Alt. Confirm the event is now VKEY_CONTROL + XK_Control_L
@@ -1221,7 +1221,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember search;
- search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+ search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kControlKey);
EventRewriter rewriter;
@@ -1243,7 +1243,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
// Remap Alt to Control too.
IntegerPrefMember alt;
- alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs, NULL);
+ alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs);
alt.SetValue(chromeos::input_method::kControlKey);
// Press left Alt. Confirm the event is now VKEY_CONTROL + XK_Control_L.
@@ -1341,7 +1341,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember search;
- search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+ search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kAltKey);
EventRewriter rewriter;
@@ -1363,7 +1363,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Remap Alt to Control.
IntegerPrefMember alt;
- alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs, NULL);
+ alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs);
alt.SetValue(chromeos::input_method::kControlKey);
// Press left Alt. Confirm the event is now VKEY_CONTROL + XK_Control_L.
@@ -1382,7 +1382,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Remap Control to Search.
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kSearchKey);
// Press left Control. Confirm the event is now VKEY_LWIN.
@@ -1453,7 +1453,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember search;
- search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+ search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kCapsLockKey);
chromeos::input_method::MockXKeyboard xkeyboard;
@@ -1628,7 +1628,7 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
EventRewriter rewriter;
@@ -1683,7 +1683,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockToControlWithFlag) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
EventRewriter rewriter;
@@ -1729,7 +1729,7 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
EventRewriter rewriter;
@@ -1943,7 +1943,7 @@ TEST_F(EventRewriterTest, TestRewriteBackspaceAndArrowKeys) {
switches::kEnableChromebookFunctionKey, "");
BooleanPrefMember search_key_as_function_key;
search_key_as_function_key.Init(prefs::kLanguageSearchKeyActsAsFunctionKey,
- &prefs, NULL);
+ &prefs);
search_key_as_function_key.SetValue(true);
@@ -2287,7 +2287,7 @@ TEST_F(EventRewriterTest, TestRewriteFunctionKeys) {
switches::kEnableChromebookFunctionKey, "");
BooleanPrefMember search_key_as_function_key;
search_key_as_function_key.Init(prefs::kLanguageSearchKeyActsAsFunctionKey,
- &prefs, NULL);
+ &prefs);
search_key_as_function_key.SetValue(true);
// Without a Search key modifier, the results should be the same as before.
@@ -2380,7 +2380,7 @@ TEST_F(EventRewriterTest, TestRewriteBackspaceAndArrowKeysWithSearchRemapped) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember search;
- search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+ search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kControlKey);
EventRewriter rewriter;
@@ -2426,7 +2426,7 @@ TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) {
TestingPrefService prefs;
chromeos::Preferences::RegisterUserPrefs(&prefs);
IntegerPrefMember control;
- control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+ control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kAltKey);
EventRewriter rewriter;
« no previous file with comments | « chrome/browser/tab_contents/spelling_menu_observer.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698