chrome/browser/chromeos/preferences_browsertest.cc - Issue 221363002: Revert of Don't handle NaturalScroll in Chrome but pass it to CMT instead

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

Issue 221363002: Revert of Don't handle NaturalScroll in Chrome but pass it to CMT instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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

« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/system/fake_input_device_settings.h » ('j') | no next file with comments »

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 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 EXPECT_EQ(prefs->GetBoolean(prefs::kTapToClickEnabled),	82 EXPECT_EQ(prefs->GetBoolean(prefs::kTapToClickEnabled),

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

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

85 input_settings_->current_mouse_settings()	85 input_settings_->current_mouse_settings()

86 .GetPrimaryButtonRight());	86 .GetPrimaryButtonRight());

87 EXPECT_EQ(prefs->GetBoolean(prefs::kTapDraggingEnabled),	87 EXPECT_EQ(prefs->GetBoolean(prefs::kTapDraggingEnabled),

88 input_settings_->current_touchpad_settings().GetTapDragging());	88 input_settings_->current_touchpad_settings().GetTapDragging());

89 EXPECT_EQ(prefs->GetBoolean(prefs::kEnableTouchpadThreeFingerClick),	89 EXPECT_EQ(prefs->GetBoolean(prefs::kEnableTouchpadThreeFingerClick),

90 input_settings_->current_touchpad_settings()	90 input_settings_->current_touchpad_settings()

91 .GetThreeFingerClick());	91 .GetThreeFingerClick());

	92 EXPECT_EQ(prefs->GetBoolean(prefs::kNaturalScroll),

	93 ui::IsNaturalScrollEnabled());

92 EXPECT_EQ(prefs->GetInteger(prefs::kMouseSensitivity),	94 EXPECT_EQ(prefs->GetInteger(prefs::kMouseSensitivity),

93 input_settings_->current_mouse_settings().GetSensitivity());	95 input_settings_->current_mouse_settings().GetSensitivity());

94 EXPECT_EQ(prefs->GetInteger(prefs::kTouchpadSensitivity),	96 EXPECT_EQ(prefs->GetInteger(prefs::kTouchpadSensitivity),

95 input_settings_->current_touchpad_settings().GetSensitivity());	97 input_settings_->current_touchpad_settings().GetSensitivity());

96 EXPECT_EQ(prefs->GetBoolean(prefs::kTouchHudProjectionEnabled),	98 EXPECT_EQ(prefs->GetBoolean(prefs::kTouchHudProjectionEnabled),

97 ash::Shell::GetInstance()->is_touch_hud_projection_enabled());	99 ash::Shell::GetInstance()->is_touch_hud_projection_enabled());

98 EXPECT_EQ(prefs->GetBoolean(prefs::kLanguageXkbAutoRepeatEnabled),	100 EXPECT_EQ(prefs->GetBoolean(prefs::kLanguageXkbAutoRepeatEnabled),

99 xkeyboard_->auto_repeat_is_enabled_);	101 xkeyboard_->auto_repeat_is_enabled_);

100 input_method::AutoRepeatRate rate = xkeyboard_->last_auto_repeat_rate_;	102 input_method::AutoRepeatRate rate = xkeyboard_->last_auto_repeat_rate_;

101 EXPECT_EQ(prefs->GetInteger(prefs::kLanguageXkbAutoRepeatDelay),	103 EXPECT_EQ(prefs->GetInteger(prefs::kLanguageXkbAutoRepeatDelay),

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

191 CheckLocalStateCorrespondsToPrefs(prefs1);	193 CheckLocalStateCorrespondsToPrefs(prefs1);

192	194

193 // Switch user back.	195 // Switch user back.

194 user_manager->SwitchActiveUser(kTestUsers[0]);	196 user_manager->SwitchActiveUser(kTestUsers[0]);

195 CheckSettingsCorrespondToPrefs(prefs1);	197 CheckSettingsCorrespondToPrefs(prefs1);

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

197 }	199 }

198	200

199 } // namespace chromeos	201 } // namespace chromeos

OLD	NEW