chrome/browser/ui/ash/system_tray_delegate_common.h - Issue 811283003: Clean-up of the system shutdown code paths

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_common.h

Issue 811283003: Clean-up of the system shutdown code paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: alignment fixes, rebase Created 5 years, 11 months 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

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_common.cc » ('j') | no next file with comments »

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

6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_	6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_

7	7

8 #include <string>	8 #include <string>

9	9

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

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 void ShowChromeSlow() override;	52 void ShowChromeSlow() override;

53 bool ShouldShowDisplayNotification() override;	53 bool ShouldShowDisplayNotification() override;

54 void ShowIMESettings() override;	54 void ShowIMESettings() override;

55 void ShowHelp() override;	55 void ShowHelp() override;

56 void ShowAccessibilityHelp() override;	56 void ShowAccessibilityHelp() override;

57 void ShowAccessibilitySettings() override;	57 void ShowAccessibilitySettings() override;

58 void ShowPublicAccountInfo() override;	58 void ShowPublicAccountInfo() override;

59 void ShowSupervisedUserInfo() override;	59 void ShowSupervisedUserInfo() override;

60 void ShowEnterpriseInfo() override;	60 void ShowEnterpriseInfo() override;

61 void ShowUserLogin() override;	61 void ShowUserLogin() override;

62 void ShutDown() override;

63 void SignOut() override;	62 void SignOut() override;

64 void RequestLockScreen() override;	63 void RequestLockScreen() override;

65 void RequestRestartForUpdate() override;	64 void RequestRestartForUpdate() override;

66 void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) override;	65 void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) override;

67 void BluetoothStartDiscovering() override;	66 void BluetoothStartDiscovering() override;

68 void BluetoothStopDiscovering() override;	67 void BluetoothStopDiscovering() override;

69 void ConnectToBluetoothDevice(const std::string& address) override;	68 void ConnectToBluetoothDevice(const std::string& address) override;

70 bool IsBluetoothDiscovering() override;	69 bool IsBluetoothDiscovering() override;

71 void GetCurrentIME(ash::IMEInfo* info) override;	70 void GetCurrentIME(ash::IMEInfo* info) override;

72 void GetAvailableIMEList(ash::IMEInfoList* list) override;	71 void GetAvailableIMEList(ash::IMEInfoList* list) override;

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105 const content::NotificationSource& source,	104 const content::NotificationSource& source,

106 const content::NotificationDetails& details) override;	105 const content::NotificationDetails& details) override;

107	106

108 scoped_ptr<content::NotificationRegistrar> registrar_;	107 scoped_ptr<content::NotificationRegistrar> registrar_;

109 base::HourClockType clock_type_;	108 base::HourClockType clock_type_;

110	109

111 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateCommon);	110 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateCommon);

112 };	111 };

113	112

114 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_	113 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_

OLD	NEW