chrome/browser/chromeos/preferences_browsertest.cc - Issue 312023002: Sync starting language and input method preferences

Side by Side Diff: chrome/browser/chromeos/preferences_browsertest.cc

Issue 312023002: Sync starting language and input method preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/chromeos/preferences.cc ('K') | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | chrome/browser/resources/options/language_list.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <sys/types.h>	5 #include <sys/types.h>

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/macros.h"	9 #include "base/macros.h"

10 #include "base/prefs/pref_service.h"	10 #include "base/prefs/pref_service.h"

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 prefs->SetBoolean(prefs::kPrimaryMouseButtonRight, !variant);	65 prefs->SetBoolean(prefs::kPrimaryMouseButtonRight, !variant);

66 prefs->SetBoolean(prefs::kTapDraggingEnabled, variant);	66 prefs->SetBoolean(prefs::kTapDraggingEnabled, variant);

67 prefs->SetBoolean(prefs::kEnableTouchpadThreeFingerClick, !variant);	67 prefs->SetBoolean(prefs::kEnableTouchpadThreeFingerClick, !variant);

68 prefs->SetBoolean(prefs::kNaturalScroll, variant);	68 prefs->SetBoolean(prefs::kNaturalScroll, variant);

69 prefs->SetInteger(prefs::kMouseSensitivity, !variant);	69 prefs->SetInteger(prefs::kMouseSensitivity, !variant);

70 prefs->SetInteger(prefs::kTouchpadSensitivity, variant);	70 prefs->SetInteger(prefs::kTouchpadSensitivity, variant);

71 prefs->SetBoolean(prefs::kTouchHudProjectionEnabled, !variant);	71 prefs->SetBoolean(prefs::kTouchHudProjectionEnabled, !variant);

72 prefs->SetBoolean(prefs::kLanguageXkbAutoRepeatEnabled, variant);	72 prefs->SetBoolean(prefs::kLanguageXkbAutoRepeatEnabled, variant);

73 prefs->SetInteger(prefs::kLanguageXkbAutoRepeatDelay, variant ? 100 : 500);	73 prefs->SetInteger(prefs::kLanguageXkbAutoRepeatDelay, variant ? 100 : 500);

74 prefs->SetInteger(prefs::kLanguageXkbAutoRepeatInterval, variant ? 1 : 4);	74 prefs->SetInteger(prefs::kLanguageXkbAutoRepeatInterval, variant ? 1 : 4);

75 prefs->SetString(prefs::kLanguagePreloadEngines,	75 prefs->SetString(prefs::kLanguagePreloadEnginesLocal,

76 variant ? "xkb:us::eng,xkb:us:dvorak:eng"	76 variant ? "xkb:us::eng,xkb:us:dvorak:eng"

77 : "xkb:us::eng,xkb:ru::rus");	77 : "xkb:us::eng,xkb:ru::rus");

78 }	78 }

79	79

80 void CheckSettingsCorrespondToPrefs(PrefService* prefs) {	80 void CheckSettingsCorrespondToPrefs(PrefService* prefs) {

81 EXPECT_EQ(prefs->GetBoolean(prefs::kTapToClickEnabled),	81 EXPECT_EQ(prefs->GetBoolean(prefs::kTapToClickEnabled),

82 input_settings_->current_touchpad_settings().GetTapToClick());	82 input_settings_->current_touchpad_settings().GetTapToClick());

83 EXPECT_EQ(prefs->GetBoolean(prefs::kPrimaryMouseButtonRight),	83 EXPECT_EQ(prefs->GetBoolean(prefs::kPrimaryMouseButtonRight),

84 input_settings_->current_mouse_settings()	84 input_settings_->current_mouse_settings()

85 .GetPrimaryButtonRight());	85 .GetPrimaryButtonRight());

(...skipping 109 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195 !prefs1->GetBoolean(prefs::kTapToClickEnabled));	195 !prefs1->GetBoolean(prefs::kTapToClickEnabled));

196 CheckLocalStateCorrespondsToPrefs(prefs1);	196 CheckLocalStateCorrespondsToPrefs(prefs1);

197	197

198 // Switch user back.	198 // Switch user back.

199 user_manager->SwitchActiveUser(kTestUsers[0]);	199 user_manager->SwitchActiveUser(kTestUsers[0]);

200 CheckSettingsCorrespondToPrefs(prefs1);	200 CheckSettingsCorrespondToPrefs(prefs1);

201 CheckLocalStateCorrespondsToPrefs(prefs1);	201 CheckLocalStateCorrespondsToPrefs(prefs1);

202 }	202 }

203	203

204 } // namespace chromeos	204 } // namespace chromeos

OLD	NEW