| Index: ash/system/tray/default_system_tray_delegate.h
|
| diff --git a/ash/system/tray/default_system_tray_delegate.h b/ash/system/tray/default_system_tray_delegate.h
|
| index 5b88b01afbbfcdfd97b4e7cef681e8fdbfd8537c..359dca48213bfd282b003e8e2fcc8fad72e69160 100644
|
| --- a/ash/system/tray/default_system_tray_delegate.h
|
| +++ b/ash/system/tray/default_system_tray_delegate.h
|
| @@ -65,10 +65,8 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
|
| virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;
|
| virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
|
| virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
|
| - virtual void ShowNetworkConfigure(const std::string& network_id,
|
| - gfx::NativeWindow parent_window) OVERRIDE;
|
| - virtual bool EnrollNetwork(const std::string& network_id,
|
| - gfx::NativeWindow parent_window) OVERRIDE;
|
| + virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE;
|
| + virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE;
|
| virtual void ManageBluetoothDevices() OVERRIDE;
|
| virtual void ToggleBluetooth() OVERRIDE;
|
| virtual bool IsBluetoothDiscovering() OVERRIDE;
|
|
|