ash/system/tray/default_system_tray_delegate.h - Issue 102373006: Merge 240486 "Implement the spring charger replacement UI and ad..."

Side by Side Diff: ash/system/tray/default_system_tray_delegate.h

Issue 102373006: Merge 240486 "Implement the spring charger replacement UI and ad..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1650/src/

Patch Set: Created 7 years 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 | « ash/system/chromeos/power/tray_power.cc ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_	5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_

6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_	6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_

7	7

8 #include "ash/ash_export.h"	8 #include "ash/ash_export.h"

9 #include "ash/system/tray/system_tray_delegate.h"	9 #include "ash/system/tray/system_tray_delegate.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 virtual bool ShouldShowDisplayNotification() OVERRIDE;	42 virtual bool ShouldShowDisplayNotification() OVERRIDE;

43 virtual void ShowDriveSettings() OVERRIDE;	43 virtual void ShowDriveSettings() OVERRIDE;

44 virtual void ShowIMESettings() OVERRIDE;	44 virtual void ShowIMESettings() OVERRIDE;

45 virtual void ShowHelp() OVERRIDE;	45 virtual void ShowHelp() OVERRIDE;

46 virtual void ShowAccessibilityHelp() OVERRIDE;	46 virtual void ShowAccessibilityHelp() OVERRIDE;

47 virtual void ShowAccessibilitySettings() OVERRIDE;	47 virtual void ShowAccessibilitySettings() OVERRIDE;

48 virtual void ShowPublicAccountInfo() OVERRIDE;	48 virtual void ShowPublicAccountInfo() OVERRIDE;

49 virtual void ShowEnterpriseInfo() OVERRIDE;	49 virtual void ShowEnterpriseInfo() OVERRIDE;

50 virtual void ShowLocallyManagedUserInfo() OVERRIDE;	50 virtual void ShowLocallyManagedUserInfo() OVERRIDE;

51 virtual void ShowUserLogin() OVERRIDE;	51 virtual void ShowUserLogin() OVERRIDE;

	52 virtual void ShowSpringChargerReplacementDialog() OVERRIDE;

	53 virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE;

52 virtual void ShutDown() OVERRIDE;	54 virtual void ShutDown() OVERRIDE;

53 virtual void SignOut() OVERRIDE;	55 virtual void SignOut() OVERRIDE;

54 virtual void RequestLockScreen() OVERRIDE;	56 virtual void RequestLockScreen() OVERRIDE;

55 virtual void RequestRestartForUpdate() OVERRIDE;	57 virtual void RequestRestartForUpdate() OVERRIDE;

56 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE;	58 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE;

57 virtual void BluetoothStartDiscovering() OVERRIDE;	59 virtual void BluetoothStartDiscovering() OVERRIDE;

58 virtual void BluetoothStopDiscovering() OVERRIDE;	60 virtual void BluetoothStopDiscovering() OVERRIDE;

59 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;	61 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;

60 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;	62 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;

61 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;	63 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 private:	95 private:

94 bool bluetooth_enabled_;	96 bool bluetooth_enabled_;

95 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;	97 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;

96	98

97 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);	99 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);

98 };	100 };

99	101

100 } // namespace ash	102 } // namespace ash

101	103

102 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_	104 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_

OLD	NEW