summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/cros/cros_library.cc3
-rw-r--r--chrome/browser/chromeos/cros/cros_library.h4
-rw-r--r--chrome/browser/chromeos/cros/cros_mock.cc27
-rw-r--r--chrome/browser/chromeos/cros/cros_mock.h7
-rw-r--r--chrome/browser/chromeos/cros/mock_touchpad_library.cc13
-rw-r--r--chrome/browser/chromeos/cros/mock_touchpad_library.h26
-rw-r--r--chrome/browser/chromeos/cros/touchpad_library.cc88
-rw-r--r--chrome/browser/chromeos/cros/touchpad_library.h28
-rw-r--r--chrome/browser/chromeos/login/login_browsertest.cc1
-rw-r--r--chrome/browser/chromeos/preferences.cc6
-rw-r--r--chrome/browser/chromeos/system/touchpad_settings.cc64
-rw-r--r--chrome/browser/chromeos/system/touchpad_settings.h23
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/chrome_tests.gypi2
14 files changed, 94 insertions, 202 deletions
diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
index c6609d2..4387e39 100644
--- a/chrome/browser/chromeos/cros/cros_library.cc
+++ b/chrome/browser/chromeos/cros/cros_library.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/chromeos/cros/power_library.h"
#include "chrome/browser/chromeos/cros/screen_lock_library.h"
#include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
-#include "chrome/browser/chromeos/cros/touchpad_library.h"
#include "chrome/browser/chromeos/cros/update_library.h"
#define DEFINE_GET_LIBRARY_METHOD(class_prefix, var_prefix) \
@@ -66,7 +65,6 @@ DEFINE_GET_LIBRARY_METHOD(Network, network);
DEFINE_GET_LIBRARY_METHOD(Power, power);
DEFINE_GET_LIBRARY_METHOD(ScreenLock, screen_lock);
DEFINE_GET_LIBRARY_METHOD(SpeechSynthesis, speech_synthesis);
-DEFINE_GET_LIBRARY_METHOD(Touchpad, touchpad);
DEFINE_GET_LIBRARY_METHOD(Update, update);
bool CrosLibrary::EnsureLoaded() {
@@ -122,7 +120,6 @@ DEFINE_SET_LIBRARY_METHOD(Network, network);
DEFINE_SET_LIBRARY_METHOD(Power, power);
DEFINE_SET_LIBRARY_METHOD(ScreenLock, screen_lock);
DEFINE_SET_LIBRARY_METHOD(SpeechSynthesis, speech_synthesis);
-DEFINE_SET_LIBRARY_METHOD(Touchpad, touchpad);
DEFINE_SET_LIBRARY_METHOD(Update, update);
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_library.h b/chrome/browser/chromeos/cros/cros_library.h
index b42ed73..f84bd89 100644
--- a/chrome/browser/chromeos/cros/cros_library.h
+++ b/chrome/browser/chromeos/cros/cros_library.h
@@ -30,7 +30,6 @@ class NetworkLibrary;
class PowerLibrary;
class ScreenLockLibrary;
class SpeechSynthesisLibrary;
-class TouchpadLibrary;
class UpdateLibrary;
// This class handles access to sub-parts of ChromeOS library. it provides
@@ -66,7 +65,6 @@ class CrosLibrary {
void SetPowerLibrary(PowerLibrary* library, bool own);
void SetScreenLockLibrary(ScreenLockLibrary* library, bool own);
void SetSpeechSynthesisLibrary(SpeechSynthesisLibrary* library, bool own);
- void SetTouchpadLibrary(TouchpadLibrary* library, bool own);
void SetUpdateLibrary(UpdateLibrary* library, bool own);
private:
@@ -89,7 +87,6 @@ class CrosLibrary {
PowerLibrary* GetPowerLibrary();
ScreenLockLibrary* GetScreenLockLibrary();
SpeechSynthesisLibrary* GetSpeechSynthesisLibrary();
- TouchpadLibrary* GetTouchpadLibrary();
UpdateLibrary* GetUpdateLibrary();
// Getter for Test API that gives access to internal members of this class.
@@ -163,7 +160,6 @@ class CrosLibrary {
Library<PowerLibrary> power_lib_;
Library<ScreenLockLibrary> screen_lock_lib_;
Library<SpeechSynthesisLibrary> speech_synthesis_lib_;
- Library<TouchpadLibrary> touchpad_lib_;
Library<UpdateLibrary> update_lib_;
// Stub implementations of the libraries should be used.
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc
index 5baa999..bfb03a9 100644
--- a/chrome/browser/chromeos/cros/cros_mock.cc
+++ b/chrome/browser/chromeos/cros/cros_mock.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/chromeos/cros/mock_power_library.h"
#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
#include "chrome/browser/chromeos/cros/mock_speech_synthesis_library.h"
-#include "chrome/browser/chromeos/cros/mock_touchpad_library.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/login/wizard_screen.h"
#include "chrome/test/in_process_browser_test.h"
@@ -38,8 +37,7 @@ CrosMock::CrosMock()
mock_network_library_(NULL),
mock_power_library_(NULL),
mock_screen_lock_library_(NULL),
- mock_speech_synthesis_library_(NULL),
- mock_touchpad_library_(NULL) {
+ mock_speech_synthesis_library_(NULL) {
}
CrosMock::~CrosMock() {
@@ -52,7 +50,6 @@ chromeos::CrosLibrary::TestApi* CrosMock::test_api() {
void CrosMock::InitStatusAreaMocks() {
InitMockNetworkLibrary();
InitMockPowerLibrary();
- InitMockTouchpadLibrary();
}
void CrosMock::InitMockLibraryLoader() {
@@ -106,14 +103,6 @@ void CrosMock::InitMockSpeechSynthesisLibrary() {
test_api()->SetSpeechSynthesisLibrary(mock_speech_synthesis_library_, true);
}
-void CrosMock::InitMockTouchpadLibrary() {
- InitMockLibraryLoader();
- if (mock_touchpad_library_)
- return;
- mock_touchpad_library_ = new StrictMock<MockTouchpadLibrary>();
- test_api()->SetTouchpadLibrary(mock_touchpad_library_, true);
-}
-
// Initialization of mocks.
MockCryptohomeLibrary* CrosMock::mock_cryptohome_library() {
return mock_cryptohome_library_;
@@ -135,15 +124,10 @@ MockSpeechSynthesisLibrary* CrosMock::mock_speech_synthesis_library() {
return mock_speech_synthesis_library_;
}
-MockTouchpadLibrary* CrosMock::mock_touchpad_library() {
- return mock_touchpad_library_;
-}
-
void CrosMock::SetStatusAreaMocksExpectations() {
SetNetworkLibraryStatusAreaExpectations();
SetPowerLibraryStatusAreaExpectations();
SetPowerLibraryExpectations();
- SetTouchpadLibraryExpectations();
}
void CrosMock::SetNetworkLibraryStatusAreaExpectations() {
@@ -312,13 +296,6 @@ void CrosMock::SetSpeechSynthesisLibraryExpectations() {
.RetiresOnSaturation();
}
-void CrosMock::SetTouchpadLibraryExpectations() {
- EXPECT_CALL(*mock_touchpad_library_, SetSensitivity(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_touchpad_library_, SetTapToClick(_))
- .Times(AnyNumber());
-}
-
void CrosMock::TearDownMocks() {
// Prevent bogus gMock leak check from firing.
if (loader_)
@@ -333,8 +310,6 @@ void CrosMock::TearDownMocks() {
test_api()->SetScreenLockLibrary(NULL, false);
if (mock_speech_synthesis_library_)
test_api()->SetSpeechSynthesisLibrary(NULL, false);
- if (mock_touchpad_library_)
- test_api()->SetTouchpadLibrary(NULL, false);
}
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_mock.h b/chrome/browser/chromeos/cros/cros_mock.h
index cfb61aa..4acc163 100644
--- a/chrome/browser/chromeos/cros/cros_mock.h
+++ b/chrome/browser/chromeos/cros/cros_mock.h
@@ -18,7 +18,6 @@ class MockNetworkLibrary;
class MockPowerLibrary;
class MockScreenLockLibrary;
class MockSpeechSynthesisLibrary;
-class MockTouchpadLibrary;
// Class for initializing mocks for some parts of CrosLibrary. Once you mock
// part of CrosLibrary it will be considered as successfully loaded and
@@ -31,7 +30,7 @@ class CrosMock {
virtual ~CrosMock();
// This method sets up basic mocks that are used by status area items:
- // LibraryLoader, Language, Network, Power, Touchpad libraries.
+ // LibraryLoader, Language, Network, Power, libraries.
// Add a call to this method at the beginning of your
// SetUpInProcessBrowserTestFixture.
void InitStatusAreaMocks();
@@ -47,7 +46,6 @@ class CrosMock {
void InitMockPowerLibrary();
void InitMockScreenLockLibrary();
void InitMockSpeechSynthesisLibrary();
- void InitMockTouchpadLibrary();
// Get mocks.
MockCryptohomeLibrary* mock_cryptohome_library();
@@ -56,7 +54,6 @@ class CrosMock {
MockPowerLibrary* mock_power_library();
MockScreenLockLibrary* mock_screen_lock_library();
MockSpeechSynthesisLibrary* mock_speech_synthesis_library();
- MockTouchpadLibrary* mock_touchpad_library();
// This method sets up corresponding expectations for basic mocks that
// are used by status area items.
@@ -72,7 +69,6 @@ class CrosMock {
void SetPowerLibraryStatusAreaExpectations();
void SetPowerLibraryExpectations();
void SetSpeechSynthesisLibraryExpectations();
- void SetTouchpadLibraryExpectations();
void TearDownMocks();
@@ -88,7 +84,6 @@ class CrosMock {
MockPowerLibrary* mock_power_library_;
MockScreenLockLibrary* mock_screen_lock_library_;
MockSpeechSynthesisLibrary* mock_speech_synthesis_library_;
- MockTouchpadLibrary* mock_touchpad_library_;
WifiNetworkVector wifi_networks_;
CellularNetworkVector cellular_networks_;
diff --git a/chrome/browser/chromeos/cros/mock_touchpad_library.cc b/chrome/browser/chromeos/cros/mock_touchpad_library.cc
deleted file mode 100644
index ce5e807..0000000
--- a/chrome/browser/chromeos/cros/mock_touchpad_library.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/cros/mock_touchpad_library.h"
-
-namespace chromeos {
-
-MockTouchpadLibrary::MockTouchpadLibrary() {}
-
-MockTouchpadLibrary::~MockTouchpadLibrary() {}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/mock_touchpad_library.h b/chrome/browser/chromeos/cros/mock_touchpad_library.h
deleted file mode 100644
index aa16f38..0000000
--- a/chrome/browser/chromeos/cros/mock_touchpad_library.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOCK_TOUCHPAD_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_MOCK_TOUCHPAD_LIBRARY_H_
-#pragma once
-
-#include "chrome/browser/chromeos/cros/touchpad_library.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace chromeos {
-
-class MockTouchpadLibrary : public TouchpadLibrary {
- public:
- MockTouchpadLibrary();
- virtual ~MockTouchpadLibrary();
-
- MOCK_METHOD1(SetSensitivity, void(int));
- MOCK_METHOD1(SetTapToClick, void(bool));
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_CROS_MOCK_TOUCHPAD_LIBRARY_H_
-
diff --git a/chrome/browser/chromeos/cros/touchpad_library.cc b/chrome/browser/chromeos/cros/touchpad_library.cc
deleted file mode 100644
index ce849d8..0000000
--- a/chrome/browser/chromeos/cros/touchpad_library.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/cros/touchpad_library.h"
-
-#include "base/command_line.h"
-#include "base/message_loop.h"
-#include "base/process_util.h"
-#include "base/stringprintf.h"
-#include "content/browser/browser_thread.h"
-
-namespace chromeos {
-namespace {
-const char* kTpControl = "/opt/google/touchpad/tpcontrol";
-} // namespace
-
-class TouchpadLibraryImpl : public TouchpadLibrary {
- public:
- TouchpadLibraryImpl() {}
- virtual ~TouchpadLibraryImpl() {}
-
- void SetSensitivity(int value) {
- // Run this on the FILE thread.
- if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
- BrowserThread::PostTask(
- BrowserThread::FILE, FROM_HERE,
- NewRunnableMethod(this,
- &TouchpadLibraryImpl::SetSensitivity, value));
- return;
- }
- std::vector<std::string> argv;
- argv.push_back(kTpControl);
- argv.push_back("sensitivity");
- argv.push_back(StringPrintf("%d", value));
-
- base::LaunchOptions options;
- options.wait = false; // Launch asynchronously.
-
- base::LaunchProcess(CommandLine(argv), options);
- }
-
- void SetTapToClick(bool enabled) {
- // Run this on the FILE thread.
- if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
- BrowserThread::PostTask(
- BrowserThread::FILE, FROM_HERE,
- NewRunnableMethod(this,
- &TouchpadLibraryImpl::SetTapToClick, enabled));
- return;
- }
- std::vector<std::string> argv;
- argv.push_back(kTpControl);
- argv.push_back("taptoclick");
- argv.push_back(enabled ? "on" : "off");
-
- base::LaunchOptions options;
- options.wait = false; // Launch asynchronously.
-
- base::LaunchProcess(CommandLine(argv), options);
- }
-
- DISALLOW_COPY_AND_ASSIGN(TouchpadLibraryImpl);
-};
-
-class TouchpadLibraryStubImpl : public TouchpadLibrary {
- public:
- TouchpadLibraryStubImpl() {}
- virtual ~TouchpadLibraryStubImpl() {}
- void SetSensitivity(int value) {}
- void SetTapToClick(bool enabled) {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TouchpadLibraryStubImpl);
-};
-
-// static
-TouchpadLibrary* TouchpadLibrary::GetImpl(bool stub) {
- if (stub)
- return new TouchpadLibraryStubImpl();
- else
- return new TouchpadLibraryImpl();
-}
-
-} // namespace chromeos
-
-// Needed for NewRunnableMethod() call above.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::TouchpadLibraryImpl);
diff --git a/chrome/browser/chromeos/cros/touchpad_library.h b/chrome/browser/chromeos/cros/touchpad_library.h
deleted file mode 100644
index b4ae088..0000000
--- a/chrome/browser/chromeos/cros/touchpad_library.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_TOUCHPAD_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_TOUCHPAD_LIBRARY_H_
-#pragma once
-
-namespace chromeos {
-
-// This interface defines interaction with the ChromeOS synaptics library APIs.
-// Users can get an instance of this library class like this:
-// chromeos::CrosLibrary::Get()->GetTouchpadLibrary()
-class TouchpadLibrary {
- public:
- virtual ~TouchpadLibrary() {}
- virtual void SetSensitivity(int value) = 0;
- virtual void SetTapToClick(bool enabled) = 0;
-
- // Factory function, creates a new instance and returns ownership.
- // For normal usage, access the singleton via CrosLibrary::Get().
- static TouchpadLibrary* GetImpl(bool stub);
-};
-
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_CROS_TOUCHPAD_LIBRARY_H_
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index cc3a590..7bf7394 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/chromeos/cros/mock_network_library.h"
#include "chrome/browser/chromeos/cros/mock_power_library.h"
#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
-#include "chrome/browser/chromeos/cros/mock_touchpad_library.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 9a277cf..cda87b2 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -11,11 +11,11 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/power_library.h"
-#include "chrome/browser/chromeos/cros/touchpad_library.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/system/touchpad_settings.h"
#include "chrome/browser/prefs/pref_member.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/chrome_notification_types.h"
@@ -274,7 +274,7 @@ void Preferences::Observe(int type,
void Preferences::NotifyPrefChanged(const std::string* pref_name) {
if (!pref_name || *pref_name == prefs::kTapToClickEnabled) {
bool enabled = tap_to_click_enabled_.GetValue();
- CrosLibrary::Get()->GetTouchpadLibrary()->SetTapToClick(enabled);
+ system::touchpad_settings::SetTapToClick(enabled);
if (pref_name)
UMA_HISTOGRAM_BOOLEAN("Touchpad.TapToClick.Changed", enabled);
else
@@ -282,7 +282,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
}
if (!pref_name || *pref_name == prefs::kTouchpadSensitivity) {
int sensitivity = sensitivity_.GetValue();
- CrosLibrary::Get()->GetTouchpadLibrary()->SetSensitivity(sensitivity);
+ system::touchpad_settings::SetSensitivity(sensitivity);
if (pref_name) {
UMA_HISTOGRAM_CUSTOM_COUNTS(
"Touchpad.Sensitivity.Changed", sensitivity, 1, 5, 5);
diff --git a/chrome/browser/chromeos/system/touchpad_settings.cc b/chrome/browser/chromeos/system/touchpad_settings.cc
new file mode 100644
index 0000000..e7d2989
--- /dev/null
+++ b/chrome/browser/chromeos/system/touchpad_settings.cc
@@ -0,0 +1,64 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/system/touchpad_settings.h"
+
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/message_loop.h"
+#include "base/process_util.h"
+#include "base/stringprintf.h"
+#include "content/browser/browser_thread.h"
+
+namespace chromeos {
+namespace system {
+namespace touchpad_settings {
+namespace {
+const char* kTpControl = "/opt/google/touchpad/tpcontrol";
+} // namespace
+
+
+void SetSensitivity(int value) {
+ // Run this on the FILE thread.
+ if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
+ BrowserThread::PostTask(
+ BrowserThread::FILE, FROM_HERE,
+ base::Bind(&SetSensitivity, value));
+ return;
+ }
+
+ std::vector<std::string> argv;
+ argv.push_back(kTpControl);
+ argv.push_back("sensitivity");
+ argv.push_back(StringPrintf("%d", value));
+
+ base::LaunchOptions options;
+ options.wait = false; // Launch asynchronously.
+
+ base::LaunchProcess(CommandLine(argv), options);
+}
+
+void SetTapToClick(bool enabled) {
+ // Run this on the FILE thread.
+ if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
+ BrowserThread::PostTask(
+ BrowserThread::FILE, FROM_HERE,
+ base::Bind(&SetTapToClick, enabled));
+ return;
+ }
+
+ std::vector<std::string> argv;
+ argv.push_back(kTpControl);
+ argv.push_back("taptoclick");
+ argv.push_back(enabled ? "on" : "off");
+
+ base::LaunchOptions options;
+ options.wait = false; // Launch asynchronously.
+
+ base::LaunchProcess(CommandLine(argv), options);
+}
+
+} // namespace touchpad_settings
+} // namespace system
+} // namespace chromeos
diff --git a/chrome/browser/chromeos/system/touchpad_settings.h b/chrome/browser/chromeos/system/touchpad_settings.h
new file mode 100644
index 0000000..acb940d
--- /dev/null
+++ b/chrome/browser/chromeos/system/touchpad_settings.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_TOUCHPAD_SETTINGS_H_
+#define CHROME_BROWSER_CHROMEOS_SYSTEM_TOUCHPAD_SETTINGS_H_
+#pragma once
+
+namespace chromeos {
+namespace system {
+namespace touchpad_settings {
+
+// Sets the touchpad sensitivity in range from 1 to 5.
+void SetSensitivity(int value);
+
+// Turns tap to click on / off.
+void SetTapToClick(bool enabled);
+
+} // namespace touchpad_settings
+} // namespace system
+} // namespace chromeos
+
+#endif // CHROME_BROWSER_CHROMEOS_SYSTEM_TOUCHPAD_SETTINGS_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 33a8cd1..51c32bd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -382,8 +382,6 @@
'browser/chromeos/cros/screen_lock_library.h',
'browser/chromeos/cros/speech_synthesis_library.cc',
'browser/chromeos/cros/speech_synthesis_library.h',
- 'browser/chromeos/cros/touchpad_library.cc',
- 'browser/chromeos/cros/touchpad_library.h',
'browser/chromeos/cros/update_library.cc',
'browser/chromeos/cros/update_library.h',
'browser/chromeos/cros_settings.cc',
@@ -718,6 +716,8 @@
'browser/chromeos/system/syslogs_provider.h',
'browser/chromeos/system/timezone_settings.cc',
'browser/chromeos/system/timezone_settings.h',
+ 'browser/chromeos/system/touchpad_settings.h',
+ 'browser/chromeos/system/touchpad_settings.cc',
'browser/chromeos/system_key_event_listener.cc',
'browser/chromeos/system_key_event_listener.h',
'browser/chromeos/tab_closeable_state_watcher.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c93ee21..a44b60e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2354,8 +2354,6 @@
'browser/chromeos/cros/mock_screen_lock_library.h',
'browser/chromeos/cros/mock_speech_synthesis_library.cc',
'browser/chromeos/cros/mock_speech_synthesis_library.h',
- 'browser/chromeos/cros/mock_touchpad_library.cc',
- 'browser/chromeos/cros/mock_touchpad_library.h',
'browser/chromeos/cros/mock_update_library.cc',
'browser/chromeos/cros/mock_update_library.h',
'browser/chromeos/login/enterprise_enrollment_screen_browsertest.cc',
generated by cgit v1.1 at 2025-05-18 01:15:30 +0000