Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: ash/common/system/tray/system_tray_controller.h

Issue 2513673004: Reland: chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: fix manifest for reland Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/public/interfaces/system_tray.mojom.h" 9 #include "ash/public/interfaces/system_tray.mojom.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void ShowChromeSlow(); 48 void ShowChromeSlow();
49 void ShowIMESettings(); 49 void ShowIMESettings();
50 void ShowHelp(); 50 void ShowHelp();
51 void ShowAccessibilityHelp(); 51 void ShowAccessibilityHelp();
52 void ShowAccessibilitySettings(); 52 void ShowAccessibilitySettings();
53 void ShowPaletteHelp(); 53 void ShowPaletteHelp();
54 void ShowPaletteSettings(); 54 void ShowPaletteSettings();
55 void ShowPublicAccountInfo(); 55 void ShowPublicAccountInfo();
56 void ShowNetworkConfigure(const std::string& network_id); 56 void ShowNetworkConfigure(const std::string& network_id);
57 void ShowNetworkCreate(const std::string& type); 57 void ShowNetworkCreate(const std::string& type);
58 void ShowThirdPartyVpnCreate(const std::string& extension_id);
58 void ShowNetworkSettings(const std::string& network_id); 59 void ShowNetworkSettings(const std::string& network_id);
59 void ShowProxySettings(); 60 void ShowProxySettings();
60 void SignOut(); 61 void SignOut();
61 void RequestRestartForUpdate(); 62 void RequestRestartForUpdate();
62 63
63 // Binds the mojom::SystemTray interface to this object. 64 // Binds the mojom::SystemTray interface to this object.
64 void BindRequest(mojom::SystemTrayRequest request); 65 void BindRequest(mojom::SystemTrayRequest request);
65 66
66 private: 67 private:
67 // Connects or reconnects to the mojom::SystemTrayClient interface when 68 // Connects or reconnects to the mojom::SystemTrayClient interface when
(...skipping 17 matching lines...) Expand all
85 86
86 // The type of clock hour display: 12 or 24 hour. 87 // The type of clock hour display: 12 or 24 hour.
87 base::HourClockType hour_clock_type_; 88 base::HourClockType hour_clock_type_;
88 89
89 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 90 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
90 }; 91 };
91 92
92 } // namspace ash 93 } // namspace ash
93 94
94 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 95 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/network/vpn_list_view.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698