Index: ash/shell.cc |
=================================================================== |
--- ash/shell.cc (revision 134777) |
+++ ash/shell.cc (working copy) |
@@ -309,9 +309,6 @@ |
virtual void ShowBluetoothSettings() OVERRIDE { |
} |
- virtual void ShowDriveSettings() OVERRIDE { |
- } |
- |
virtual void ShowIMESettings() OVERRIDE { |
} |
@@ -378,13 +375,6 @@ |
virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
} |
- virtual void CancelDriveOperation(const FilePath&) OVERRIDE { |
- } |
- |
- virtual void GetDriveOperationStatusList( |
- ash::DriveOperationStatusList*) OVERRIDE { |
- } |
- |
virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, |
bool large) OVERRIDE { |
} |
Property changes on: ash/shell.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |