summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorskrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 21:06:14 +0000
committerskrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 21:06:14 +0000
commit20a6c0635de8b60be3858111a0590470c6f3e9fc (patch)
tree4e07cfc5efc18c2dd571795394e6e05844b8b00c /chrome/browser/chromeos
parent42d7cd2e755c8b9907203f1eb7199038d026fd32 (diff)
downloadchromium_src-20a6c0635de8b60be3858111a0590470c6f3e9fc.zip
chromium_src-20a6c0635de8b60be3858111a0590470c6f3e9fc.tar.gz
chromium_src-20a6c0635de8b60be3858111a0590470c6f3e9fc.tar.bz2
kill .cc files
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/cros/fake_cryptohome_library.cc48
-rw-r--r--chrome/browser/chromeos/cros/fake_cryptohome_library.h41
-rw-r--r--chrome/browser/chromeos/cros/fake_input_method_library.cc59
-rw-r--r--chrome/browser/chromeos/cros/fake_input_method_library.h40
-rw-r--r--chrome/browser/chromeos/cros/fake_keyboard_library.cc27
-rw-r--r--chrome/browser/chromeos/cros/fake_keyboard_library.h16
-rw-r--r--chrome/browser/chromeos/cros/fake_library_loader.cc13
-rw-r--r--chrome/browser/chromeos/cros/fake_library_loader.h4
-rw-r--r--chrome/browser/chromeos/cros/fake_login_library.cc22
-rw-r--r--chrome/browser/chromeos/cros/fake_login_library.h12
-rw-r--r--chrome/browser/chromeos/cros/fake_mount_library.cc19
-rw-r--r--chrome/browser/chromeos/cros/fake_mount_library.h12
-rw-r--r--chrome/browser/chromeos/cros/fake_network_library.cc110
-rw-r--r--chrome/browser/chromeos/cros/fake_network_library.h75
-rw-r--r--chrome/browser/chromeos/cros/fake_power_library.cc15
-rw-r--r--chrome/browser/chromeos/cros/fake_power_library.h4
-rw-r--r--chrome/browser/chromeos/cros/fake_screen_lock_library.cc27
-rw-r--r--chrome/browser/chromeos/cros/fake_screen_lock_library.h12
-rw-r--r--chrome/browser/chromeos/cros/fake_synaptics_library.cc17
-rw-r--r--chrome/browser/chromeos/cros/fake_synaptics_library.h4
-rw-r--r--chrome/browser/chromeos/cros/fake_system_library.cc29
-rw-r--r--chrome/browser/chromeos/cros/fake_system_library.h17
-rw-r--r--chrome/browser/chromeos/cros/fake_update_library.cc19
-rw-r--r--chrome/browser/chromeos/cros/fake_update_library.h8
24 files changed, 170 insertions, 480 deletions
diff --git a/chrome/browser/chromeos/cros/fake_cryptohome_library.cc b/chrome/browser/chromeos/cros/fake_cryptohome_library.cc
deleted file mode 100644
index 37ecdc0..0000000
--- a/chrome/browser/chromeos/cros/fake_cryptohome_library.cc
+++ /dev/null
@@ -1,48 +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.
-
-#include "chrome/browser/chromeos/cros/fake_cryptohome_library.h"
-
-namespace chromeos {
-
-FakeCryptohomeLibrary::FakeCryptohomeLibrary() {
- // The salt must be non-empty and an even length.
- salt_.push_back(0);
- salt_.push_back(0);
-}
-
-bool FakeCryptohomeLibrary::CheckKey(const std::string& user_email,
- const std::string& passhash) {
- return true;
-}
-
-bool FakeCryptohomeLibrary::MigrateKey(const std::string& user_email,
- const std::string& old_hash,
- const std::string& new_hash) {
- return true;
-}
-
-bool FakeCryptohomeLibrary::Remove(const std::string& user_email) {
- return true;
-}
-
-bool FakeCryptohomeLibrary::Mount(const std::string& user_email,
- const std::string& passhash,
- int* error_code) {
- return true;
-}
-
-bool FakeCryptohomeLibrary::MountForBwsi(int* error_code) {
- return true;
-}
-
-bool FakeCryptohomeLibrary::IsMounted() {
- return true;
-}
-
-CryptohomeBlob FakeCryptohomeLibrary::GetSystemSalt() {
- return salt_;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_cryptohome_library.h b/chrome/browser/chromeos/cros/fake_cryptohome_library.h
index bb4f8c0..f94eeac 100644
--- a/chrome/browser/chromeos/cros/fake_cryptohome_library.h
+++ b/chrome/browser/chromeos/cros/fake_cryptohome_library.h
@@ -13,20 +13,45 @@ namespace chromeos {
class FakeCryptohomeLibrary : public CryptohomeLibrary {
public:
- FakeCryptohomeLibrary();
+ FakeCryptohomeLibrary() {
+ // The salt must be non-empty and an even length.
+ salt_.push_back(0);
+ salt_.push_back(0);
+ }
+
virtual ~FakeCryptohomeLibrary() {}
virtual bool Mount(const std::string& user_email,
const std::string& passhash,
- int* error_code);
- virtual bool MountForBwsi(int* error_code);
+ int* error_code) {
+ return true;
+ }
+
+ virtual bool MountForBwsi(int* error_code) {
+ return true;
+ }
+
virtual bool CheckKey(const std::string& user_email,
- const std::string& passhash);
+ const std::string& passhash) {
+ return true;
+ }
+
virtual bool MigrateKey(const std::string& user_email,
const std::string& old_hash,
- const std::string& new_hash);
- virtual bool Remove(const std::string& user_email);
- virtual bool IsMounted();
- virtual CryptohomeBlob GetSystemSalt();
+ const std::string& new_hash) {
+ return true;
+ }
+
+ virtual bool Remove(const std::string& user_email) {
+ return true;
+ }
+
+ virtual bool IsMounted() {
+ return true;
+ }
+
+ virtual CryptohomeBlob GetSystemSalt() {
+ return salt_;
+ }
private:
CryptohomeBlob salt_;
diff --git a/chrome/browser/chromeos/cros/fake_input_method_library.cc b/chrome/browser/chromeos/cros/fake_input_method_library.cc
deleted file mode 100644
index 36095f3..0000000
--- a/chrome/browser/chromeos/cros/fake_input_method_library.cc
+++ /dev/null
@@ -1,59 +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.
-
-#include "base/scoped_ptr.h"
-#include "chrome/browser/chromeos/cros/fake_input_method_library.h"
-
-namespace chromeos {
-
-FakeInputMethodLibrary::FakeInputMethodLibrary()
- : previous_input_method_("", "", "", ""),
- current_input_method_("", "", "", "") {
-}
-
-void FakeInputMethodLibrary::AddObserver(Observer* observer) {
-}
-
-void FakeInputMethodLibrary::RemoveObserver(Observer* observer) {
-}
-
-chromeos::InputMethodDescriptors*
-FakeInputMethodLibrary::GetActiveInputMethods() {
- return CreateFallbackInputMethodDescriptors();
-}
-
-size_t FakeInputMethodLibrary::GetNumActiveInputMethods() {
- scoped_ptr<InputMethodDescriptors> input_methods(GetActiveInputMethods());
- return input_methods->size();
-}
-
-chromeos::InputMethodDescriptors*
-FakeInputMethodLibrary::GetSupportedInputMethods() {
- return CreateFallbackInputMethodDescriptors();
-}
-
-void FakeInputMethodLibrary::ChangeInputMethod(
- const std::string& input_method_id) {
-}
-
-void FakeInputMethodLibrary::SetImePropertyActivated(const std::string& key,
- bool activated) {
-}
-
-bool FakeInputMethodLibrary::InputMethodIsActivated(
- const std::string& input_method_id) {
- return true;
-}
-
-bool FakeInputMethodLibrary::GetImeConfig(
- const char* section, const char* config_name, ImeConfigValue* out_value) {
- return true;
-}
-
-bool FakeInputMethodLibrary::SetImeConfig(
- const char* section, const char* config_name, const ImeConfigValue& value) {
- return true;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_input_method_library.h b/chrome/browser/chromeos/cros/fake_input_method_library.h
index 1662b9f..fe2fd5c 100644
--- a/chrome/browser/chromeos/cros/fake_input_method_library.h
+++ b/chrome/browser/chromeos/cros/fake_input_method_library.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/scoped_ptr.h"
#include "chrome/browser/chromeos/cros/input_method_library.h"
#include "third_party/cros/chromeos_input_method.h"
@@ -14,22 +15,39 @@ namespace chromeos {
class FakeInputMethodLibrary : public InputMethodLibrary {
public:
- FakeInputMethodLibrary();
+ FakeInputMethodLibrary()
+ : previous_input_method_("", "", "", ""),
+ current_input_method_("", "", "", "") {
+ }
+
virtual ~FakeInputMethodLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
- virtual InputMethodDescriptors* GetActiveInputMethods();
- virtual size_t GetNumActiveInputMethods();
- virtual InputMethodDescriptors* GetSupportedInputMethods();
- virtual void ChangeInputMethod(const std::string& input_method_id);
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
+ virtual InputMethodDescriptors* GetActiveInputMethods() {
+ return CreateFallbackInputMethodDescriptors();
+ }
+ virtual size_t GetNumActiveInputMethods() {
+ scoped_ptr<InputMethodDescriptors> input_methods(GetActiveInputMethods());
+ return input_methods->size();
+ }
+ virtual InputMethodDescriptors* GetSupportedInputMethods() {
+ return CreateFallbackInputMethodDescriptors();
+ }
+ virtual void ChangeInputMethod(const std::string& input_method_id) {}
virtual void SetImePropertyActivated(const std::string& key,
- bool activated);
- virtual bool InputMethodIsActivated(const std::string& input_method_id);
+ bool activated) {}
+ virtual bool InputMethodIsActivated(const std::string& input_method_id) {
+ return true;
+ }
virtual bool GetImeConfig(
- const char* section, const char* config_name, ImeConfigValue* out_value);
+ const char* section, const char* config_name, ImeConfigValue* out_value) {
+ return true;
+ }
virtual bool SetImeConfig(const char* section,
const char* config_name,
- const ImeConfigValue& value);
+ const ImeConfigValue& value) {
+ return true;
+ }
virtual const InputMethodDescriptor& previous_input_method() const {
return previous_input_method_;
diff --git a/chrome/browser/chromeos/cros/fake_keyboard_library.cc b/chrome/browser/chromeos/cros/fake_keyboard_library.cc
deleted file mode 100644
index 7f9b21e..0000000
--- a/chrome/browser/chromeos/cros/fake_keyboard_library.cc
+++ /dev/null
@@ -1,27 +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.
-
-#include "chrome/browser/chromeos/cros/fake_keyboard_library.h"
-
-namespace chromeos {
-
-std::string FakeKeyboardLibrary::GetCurrentKeyboardLayoutName() const {
- return "";
-}
-
-bool FakeKeyboardLibrary::SetCurrentKeyboardLayoutByName(
- const std::string& layout_name) {
- return true;
-}
-
-bool FakeKeyboardLibrary::GetKeyboardLayoutPerWindow(
- bool* is_per_window) const {
- return true;
-}
-
-bool FakeKeyboardLibrary::SetKeyboardLayoutPerWindow(bool is_per_window) {
- return true;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_keyboard_library.h b/chrome/browser/chromeos/cros/fake_keyboard_library.h
index 7e35fee..c2bb878 100644
--- a/chrome/browser/chromeos/cros/fake_keyboard_library.h
+++ b/chrome/browser/chromeos/cros/fake_keyboard_library.h
@@ -15,10 +15,18 @@ class FakeKeyboardLibrary : public KeyboardLibrary {
public:
FakeKeyboardLibrary() {}
virtual ~FakeKeyboardLibrary() {}
- virtual std::string GetCurrentKeyboardLayoutName() const;
- virtual bool SetCurrentKeyboardLayoutByName(const std::string& layout_name);
- virtual bool GetKeyboardLayoutPerWindow(bool* is_per_window) const;
- virtual bool SetKeyboardLayoutPerWindow(bool is_per_window);
+ virtual std::string GetCurrentKeyboardLayoutName() const {
+ return "";
+ }
+ virtual bool SetCurrentKeyboardLayoutByName(const std::string& layout_name) {
+ return true;
+ }
+ virtual bool GetKeyboardLayoutPerWindow(bool* is_per_window) const {
+ return true;
+ }
+ virtual bool SetKeyboardLayoutPerWindow(bool is_per_window) {
+ return true;
+ }
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_library_loader.cc b/chrome/browser/chromeos/cros/fake_library_loader.cc
deleted file mode 100644
index 6d29d1b..0000000
--- a/chrome/browser/chromeos/cros/fake_library_loader.cc
+++ /dev/null
@@ -1,13 +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.
-
-#include "chrome/browser/chromeos/cros/fake_library_loader.h"
-
-namespace chromeos {
-
-bool FakeLibraryLoader::Load(std::string* load_error_string) {
- return true;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_library_loader.h b/chrome/browser/chromeos/cros/fake_library_loader.h
index e2e6661..1dec140 100644
--- a/chrome/browser/chromeos/cros/fake_library_loader.h
+++ b/chrome/browser/chromeos/cros/fake_library_loader.h
@@ -16,7 +16,9 @@ class FakeLibraryLoader : public LibraryLoader {
public:
FakeLibraryLoader() {}
virtual ~FakeLibraryLoader() {}
- virtual bool Load(std::string* load_error_string);
+ virtual bool Load(std::string* load_error_string) {
+ return true;
+ }
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_login_library.cc b/chrome/browser/chromeos/cros/fake_login_library.cc
deleted file mode 100644
index af41fa4..0000000
--- a/chrome/browser/chromeos/cros/fake_login_library.cc
+++ /dev/null
@@ -1,22 +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.
-
-#include "chrome/browser/chromeos/cros/fake_login_library.h"
-
-namespace chromeos {
-
-bool FakeLoginLibrary::EmitLoginPromptReady() {
- return true;
-}
-
-bool FakeLoginLibrary::StartSession(const std::string& user_email,
- const std::string& unique_id) {
- return true;
-}
-
-bool FakeLoginLibrary::StopSession(const std::string& unique_id) {
- return true;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_login_library.h b/chrome/browser/chromeos/cros/fake_login_library.h
index ebaa1d6..9c4f7ba 100644
--- a/chrome/browser/chromeos/cros/fake_login_library.h
+++ b/chrome/browser/chromeos/cros/fake_login_library.h
@@ -15,10 +15,16 @@ class FakeLoginLibrary : public LoginLibrary {
public:
FakeLoginLibrary() {}
virtual ~FakeLoginLibrary() {}
- virtual bool EmitLoginPromptReady();
+ virtual bool EmitLoginPromptReady() {
+ return true;
+ }
virtual bool StartSession(const std::string& user_email,
- const std::string& unique_id);
- virtual bool StopSession(const std::string& unique_id);
+ const std::string& unique_id) {
+ return true;
+ }
+ virtual bool StopSession(const std::string& unique_id) {
+ return true;
+ }
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_mount_library.cc b/chrome/browser/chromeos/cros/fake_mount_library.cc
deleted file mode 100644
index 9b2ae4f..0000000
--- a/chrome/browser/chromeos/cros/fake_mount_library.cc
+++ /dev/null
@@ -1,19 +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.
-
-#include "chrome/browser/chromeos/cros/fake_mount_library.h"
-
-namespace chromeos {
-
-void FakeMountLibrary::AddObserver(Observer* observer) {
-}
-
-void FakeMountLibrary::RemoveObserver(Observer* observer) {
-}
-
-bool FakeMountLibrary::MountPath(const char* device_path) {
- return true;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_mount_library.h b/chrome/browser/chromeos/cros/fake_mount_library.h
index 4fea9ad..2ba69a8 100644
--- a/chrome/browser/chromeos/cros/fake_mount_library.h
+++ b/chrome/browser/chromeos/cros/fake_mount_library.h
@@ -14,10 +14,14 @@ class FakeMountLibrary : public MountLibrary {
public:
FakeMountLibrary() {}
virtual ~FakeMountLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
- virtual const DiskVector& disks() const { return disks_; }
- virtual bool MountPath(const char* device_path);
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
+ virtual const DiskVector& disks() const {
+ return disks_;
+ }
+ virtual bool MountPath(const char* device_path) {
+ return true;
+ }
private:
DiskVector disks_;
diff --git a/chrome/browser/chromeos/cros/fake_network_library.cc b/chrome/browser/chromeos/cros/fake_network_library.cc
deleted file mode 100644
index 585fd73..0000000
--- a/chrome/browser/chromeos/cros/fake_network_library.cc
+++ /dev/null
@@ -1,110 +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.
-
-#include "chrome/browser/chromeos/cros/fake_network_library.h"
-
-namespace chromeos {
-
-FakeNetworkLibrary::FakeNetworkLibrary() : ip_address_("1.1.1.1") {
-}
-
-void FakeNetworkLibrary::AddObserver(Observer* observer) {
-}
-
-void FakeNetworkLibrary::RemoveObserver(Observer* observer) {
-}
-
-bool FakeNetworkLibrary::Connected() const {
- return true;
-}
-
-bool FakeNetworkLibrary::Connecting() const {
- return false;
-}
-
-const std::string& FakeNetworkLibrary::IPAddress() const {
- return ip_address_;
-}
-
-bool FakeNetworkLibrary::FindWifiNetworkByPath(
- const std::string& path, WifiNetwork* result) const {
- return false;
-}
-
-bool FakeNetworkLibrary::FindCellularNetworkByPath(
- const std::string& path, CellularNetwork* result) const {
- return false;
-}
-
-void FakeNetworkLibrary::RequestWifiScan() {
-}
-
-bool FakeNetworkLibrary::GetWifiAccessPoints(WifiAccessPointVector* result) {
- return true;
-}
-
-bool FakeNetworkLibrary::ConnectToPreferredNetworkIfAvailable() {
- return false;
-}
-
-bool FakeNetworkLibrary::PreferredNetworkConnected() {
- return false;
-}
-
-bool FakeNetworkLibrary::PreferredNetworkFailed() {
- return false;
-}
-
-void FakeNetworkLibrary::ConnectToWifiNetwork(WifiNetwork network,
- const std::string& password,
- const std::string& identity,
- const std::string& certpath) {
-}
-
-void FakeNetworkLibrary::ConnectToWifiNetwork(const std::string& ssid,
- const std::string& password,
- const std::string& identity,
- const std::string& certpath,
- bool auto_connect) {
-}
-
-void FakeNetworkLibrary::ConnectToCellularNetwork(CellularNetwork network) {
-}
-
-void FakeNetworkLibrary::DisconnectFromWirelessNetwork(
- const WirelessNetwork& network) {
-}
-
-void FakeNetworkLibrary::SaveCellularNetwork(const CellularNetwork& network) {
-}
-
-void FakeNetworkLibrary::SaveWifiNetwork(const WifiNetwork& network) {
-}
-
-void FakeNetworkLibrary::ForgetWirelessNetwork(const WirelessNetwork& network) {
-}
-
-void FakeNetworkLibrary::EnableEthernetNetworkDevice(bool enable) {
-}
-
-void FakeNetworkLibrary::EnableWifiNetworkDevice(bool enable) {
-}
-
-void FakeNetworkLibrary::EnableCellularNetworkDevice(bool enable) {
-}
-
-void FakeNetworkLibrary::EnableOfflineMode(bool enable) {
-}
-
-NetworkIPConfigVector FakeNetworkLibrary::GetIPConfigs(
- const std::string& device_path) {
- NetworkIPConfigVector ipconfig_vector;
- return ipconfig_vector;
-}
-
-std::string FakeNetworkLibrary::GetHtmlInfo(int refresh) {
- return "";
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_network_library.h b/chrome/browser/chromeos/cros/fake_network_library.h
index 947441b..965cb4b 100644
--- a/chrome/browser/chromeos/cros/fake_network_library.h
+++ b/chrome/browser/chromeos/cros/fake_network_library.h
@@ -14,10 +14,10 @@ namespace chromeos {
class FakeNetworkLibrary : public NetworkLibrary {
public:
- FakeNetworkLibrary();
+ FakeNetworkLibrary() : ip_address_("1.1.1.1") {}
virtual ~FakeNetworkLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
virtual const EthernetNetwork& ethernet_network() const { return ethernet_; }
virtual bool ethernet_connecting() const { return false; }
@@ -33,9 +33,15 @@ class FakeNetworkLibrary : public NetworkLibrary {
virtual bool cellular_connected() const { return false; }
virtual int cellular_strength() const { return 0; }
- virtual bool Connected() const;
- virtual bool Connecting() const;
- virtual const std::string& IPAddress() const;
+ virtual bool Connected() const {
+ return true;
+ }
+ virtual bool Connecting() const {
+ return false;
+ }
+ virtual const std::string& IPAddress() const {
+ return ip_address_;
+ }
virtual const WifiNetworkVector& wifi_networks() const {
return wifi_networks_;
@@ -54,29 +60,41 @@ class FakeNetworkLibrary : public NetworkLibrary {
}
virtual bool FindWifiNetworkByPath(const std::string& path,
- WifiNetwork* network) const;
+ WifiNetwork* network) const {
+ return false;
+ }
virtual bool FindCellularNetworkByPath(const std::string& path,
- CellularNetwork* network) const;
+ CellularNetwork* network) const {
+ return false;
+ }
- virtual void RequestWifiScan();
- virtual bool GetWifiAccessPoints(WifiAccessPointVector* result);
- virtual bool ConnectToPreferredNetworkIfAvailable();
- virtual bool PreferredNetworkConnected();
- virtual bool PreferredNetworkFailed();
+ virtual void RequestWifiScan() {}
+ virtual bool GetWifiAccessPoints(WifiAccessPointVector* result) {
+ return true;
+ }
+ virtual bool ConnectToPreferredNetworkIfAvailable() {
+ return false;
+ }
+ virtual bool PreferredNetworkConnected() {
+ return false;
+ }
+ virtual bool PreferredNetworkFailed() {
+ return false;
+ }
virtual void ConnectToWifiNetwork(WifiNetwork network,
const std::string& password,
const std::string& identity,
- const std::string& certpath);
+ const std::string& certpath) {}
virtual void ConnectToWifiNetwork(const std::string& ssid,
const std::string& password,
const std::string& identity,
const std::string& certpath,
- bool auto_connect);
- virtual void ConnectToCellularNetwork(CellularNetwork network);
- virtual void DisconnectFromWirelessNetwork(const WirelessNetwork& network);
- virtual void SaveCellularNetwork(const CellularNetwork& network);
- virtual void SaveWifiNetwork(const WifiNetwork& network);
- virtual void ForgetWirelessNetwork(const WirelessNetwork& network);
+ bool auto_connect) {}
+ virtual void ConnectToCellularNetwork(CellularNetwork network) {}
+ virtual void DisconnectFromWirelessNetwork(const WirelessNetwork& network) {}
+ virtual void SaveCellularNetwork(const CellularNetwork& network) {}
+ virtual void SaveWifiNetwork(const WifiNetwork& network) {}
+ virtual void ForgetWirelessNetwork(const WirelessNetwork& network) {}
virtual bool ethernet_available() const { return true; }
virtual bool wifi_available() const { return false; }
@@ -88,12 +106,17 @@ class FakeNetworkLibrary : public NetworkLibrary {
virtual bool offline_mode() const { return false; }
- virtual void EnableEthernetNetworkDevice(bool enable);
- virtual void EnableWifiNetworkDevice(bool enable);
- virtual void EnableCellularNetworkDevice(bool enable);
- virtual void EnableOfflineMode(bool enable);
- virtual NetworkIPConfigVector GetIPConfigs(const std::string& device_path);
- virtual std::string GetHtmlInfo(int refresh);
+ virtual void EnableEthernetNetworkDevice(bool enable) {}
+ virtual void EnableWifiNetworkDevice(bool enable) {}
+ virtual void EnableCellularNetworkDevice(bool enable) {}
+ virtual void EnableOfflineMode(bool enable) {}
+ virtual NetworkIPConfigVector GetIPConfigs(const std::string& device_path) {
+ NetworkIPConfigVector ipconfig_vector;
+ return ipconfig_vector;
+ }
+ virtual std::string GetHtmlInfo(int refresh) {
+ return "";
+ }
private:
std::string ip_address_;
diff --git a/chrome/browser/chromeos/cros/fake_power_library.cc b/chrome/browser/chromeos/cros/fake_power_library.cc
deleted file mode 100644
index 0d06a33..0000000
--- a/chrome/browser/chromeos/cros/fake_power_library.cc
+++ /dev/null
@@ -1,15 +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.
-
-#include "chrome/browser/chromeos/cros/fake_power_library.h"
-
-namespace chromeos {
-
-void FakePowerLibrary::AddObserver(Observer* observer) {
-}
-
-void FakePowerLibrary::RemoveObserver(Observer* observer) {
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_power_library.h b/chrome/browser/chromeos/cros/fake_power_library.h
index 0d74eac..c9c44e7 100644
--- a/chrome/browser/chromeos/cros/fake_power_library.h
+++ b/chrome/browser/chromeos/cros/fake_power_library.h
@@ -13,8 +13,8 @@ class FakePowerLibrary : public PowerLibrary {
public:
FakePowerLibrary() {}
virtual ~FakePowerLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
virtual bool line_power_on() const { return true; }
virtual bool battery_fully_charged() const { return true; }
virtual double battery_percentage() const { return 100; }
diff --git a/chrome/browser/chromeos/cros/fake_screen_lock_library.cc b/chrome/browser/chromeos/cros/fake_screen_lock_library.cc
deleted file mode 100644
index bbdd758..0000000
--- a/chrome/browser/chromeos/cros/fake_screen_lock_library.cc
+++ /dev/null
@@ -1,27 +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.
-
-#include "chrome/browser/chromeos/cros/fake_screen_lock_library.h"
-
-namespace chromeos {
-
-void FakeScreenLockLibrary::AddObserver(Observer* observer) {
-}
-
-void FakeScreenLockLibrary::RemoveObserver(Observer* observer) {
-}
-
-void FakeScreenLockLibrary::NotifyScreenLockRequested() {
-}
-
-void FakeScreenLockLibrary::NotifyScreenLockCompleted() {
-}
-
-void FakeScreenLockLibrary::NotifyScreenUnlockRequested() {
-}
-
-void FakeScreenLockLibrary::NotifyScreenUnlockCompleted() {
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_screen_lock_library.h b/chrome/browser/chromeos/cros/fake_screen_lock_library.h
index dd063c9..debec628 100644
--- a/chrome/browser/chromeos/cros/fake_screen_lock_library.h
+++ b/chrome/browser/chromeos/cros/fake_screen_lock_library.h
@@ -13,12 +13,12 @@ class FakeScreenLockLibrary : public ScreenLockLibrary {
public:
FakeScreenLockLibrary() {}
virtual ~FakeScreenLockLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
- virtual void NotifyScreenLockRequested();
- virtual void NotifyScreenLockCompleted();
- virtual void NotifyScreenUnlockRequested();
- virtual void NotifyScreenUnlockCompleted();
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
+ virtual void NotifyScreenLockRequested() {}
+ virtual void NotifyScreenLockCompleted() {}
+ virtual void NotifyScreenUnlockRequested() {}
+ virtual void NotifyScreenUnlockCompleted() {}
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_synaptics_library.cc b/chrome/browser/chromeos/cros/fake_synaptics_library.cc
deleted file mode 100644
index 7fac85b..0000000
--- a/chrome/browser/chromeos/cros/fake_synaptics_library.cc
+++ /dev/null
@@ -1,17 +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.
-
-#include "chrome/browser/chromeos/cros/fake_synaptics_library.h"
-
-namespace chromeos {
-
-void FakeSynapticsLibrary::SetBoolParameter(SynapticsParameter param,
- bool value) {
-}
-
-void FakeSynapticsLibrary::SetRangeParameter(SynapticsParameter param,
- int value) {
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_synaptics_library.h b/chrome/browser/chromeos/cros/fake_synaptics_library.h
index e30aa3d..670762d 100644
--- a/chrome/browser/chromeos/cros/fake_synaptics_library.h
+++ b/chrome/browser/chromeos/cros/fake_synaptics_library.h
@@ -13,8 +13,8 @@ class FakeSynapticsLibrary : public SynapticsLibrary {
public:
FakeSynapticsLibrary() {}
virtual ~FakeSynapticsLibrary() {}
- virtual void SetBoolParameter(SynapticsParameter param, bool value);
- virtual void SetRangeParameter(SynapticsParameter param, int value);
+ virtual void SetBoolParameter(SynapticsParameter param, bool value) {}
+ virtual void SetRangeParameter(SynapticsParameter param, int value) {}
};
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_system_library.cc b/chrome/browser/chromeos/cros/fake_system_library.cc
deleted file mode 100644
index adf65ca..0000000
--- a/chrome/browser/chromeos/cros/fake_system_library.cc
+++ /dev/null
@@ -1,29 +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.
-
-#include "chrome/browser/chromeos/cros/fake_system_library.h"
-
-namespace chromeos {
-
-FakeSystemLibrary::FakeSystemLibrary() {
- std::string id = "US/Pacific";
- icu::TimeZone* timezone =
- icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(id));
- timezone_.reset(timezone);
-}
-
-void FakeSystemLibrary::AddObserver(Observer* observer) {
-}
-
-void FakeSystemLibrary::RemoveObserver(Observer* observer) {
-}
-
-const icu::TimeZone& FakeSystemLibrary::GetTimezone() {
- return *timezone_.get();
-}
-
-void FakeSystemLibrary::SetTimezone(const icu::TimeZone* timezone) {
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_system_library.h b/chrome/browser/chromeos/cros/fake_system_library.h
index 0e4d6c7..8d02fc0 100644
--- a/chrome/browser/chromeos/cros/fake_system_library.h
+++ b/chrome/browser/chromeos/cros/fake_system_library.h
@@ -15,12 +15,19 @@ namespace chromeos {
class FakeSystemLibrary : public SystemLibrary {
public:
- FakeSystemLibrary();
+ FakeSystemLibrary() {
+ std::string id = "US/Pacific";
+ icu::TimeZone* timezone =
+ icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(id));
+ timezone_.reset(timezone);
+ }
virtual ~FakeSystemLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
- virtual const icu::TimeZone& GetTimezone();
- virtual void SetTimezone(const icu::TimeZone*);
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
+ virtual const icu::TimeZone& GetTimezone() {
+ return *timezone_.get();
+ }
+ virtual void SetTimezone(const icu::TimeZone*) {}
private:
scoped_ptr<icu::TimeZone> timezone_;
diff --git a/chrome/browser/chromeos/cros/fake_update_library.cc b/chrome/browser/chromeos/cros/fake_update_library.cc
deleted file mode 100644
index 1cfb276..0000000
--- a/chrome/browser/chromeos/cros/fake_update_library.cc
+++ /dev/null
@@ -1,19 +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.
-
-#include "chrome/browser/chromeos/cros/fake_update_library.h"
-
-namespace chromeos {
-
-void FakeUpdateLibrary::AddObserver(Observer* observer) {
-}
-
-void FakeUpdateLibrary::RemoveObserver(Observer* observer) {
-}
-
-const UpdateLibrary::Status& FakeUpdateLibrary::status() const {
- return status_;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/fake_update_library.h b/chrome/browser/chromeos/cros/fake_update_library.h
index bda0f10..a80366c 100644
--- a/chrome/browser/chromeos/cros/fake_update_library.h
+++ b/chrome/browser/chromeos/cros/fake_update_library.h
@@ -13,9 +13,11 @@ class FakeUpdateLibrary : public UpdateLibrary {
public:
FakeUpdateLibrary() {}
virtual ~FakeUpdateLibrary() {}
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
- virtual const Status& status() const;
+ virtual void AddObserver(Observer* observer) {}
+ virtual void RemoveObserver(Observer* observer) {}
+ virtual const Status& status() const {
+ return status_;
+ }
private:
Status status_;