| Index: chrome/browser/ui/ash/system_tray_client.h
|
| diff --git a/chrome/browser/ui/ash/system_tray_client.h b/chrome/browser/ui/ash/system_tray_client.h
|
| index 2c5787595e166d03324c427c7be49e9fda2ef982..9ae3ee01a6fcd8e8340c4f6cf3bdff8f453d6440 100644
|
| --- a/chrome/browser/ui/ash/system_tray_client.h
|
| +++ b/chrome/browser/ui/ash/system_tray_client.h
|
| @@ -24,13 +24,6 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
|
|
|
| static SystemTrayClient* Get();
|
|
|
| - private:
|
| - // Connects or reconnects the |system_tray_| interface.
|
| - void ConnectToSystemTray();
|
| -
|
| - // Handles errors on the |system_tray_| interface connection.
|
| - void OnClientConnectionError();
|
| -
|
| // ash::mojom::SystemTrayClient:
|
| void ShowSettings() override;
|
| void ShowDateSettings() override;
|
| @@ -44,11 +37,19 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
|
| void ShowPaletteHelp() override;
|
| void ShowPaletteSettings() override;
|
| void ShowPublicAccountInfo() override;
|
| + void ShowNetworkSettings(const std::string& network_id) override;
|
| void ShowProxySettings() override;
|
|
|
| + private:
|
| // chromeos::system::SystemClockObserver:
|
| void OnSystemClockChanged(chromeos::system::SystemClock* clock) override;
|
|
|
| + // Connects or reconnects the |system_tray_| interface.
|
| + void ConnectToSystemTray();
|
| +
|
| + // Handles errors on the |system_tray_| interface connection.
|
| + void OnClientConnectionError();
|
| +
|
| // System tray mojo service in ash.
|
| ash::mojom::SystemTrayPtr system_tray_;
|
|
|
|
|