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

Unified Diff: ash/common/system/tray/system_tray_controller.h

Issue 2411223002: chromeos: Refactor system tray Wi-Fi connect dialog so it works with mash (Closed)
Patch Set: NON_EXPORTED_BASE Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/system/tray/system_tray_controller.h
diff --git a/ash/common/system/tray/system_tray_controller.h b/ash/common/system/tray/system_tray_controller.h
index 0a595036d723d8d58087d4c1149368d158c89d31..442ba0e0542f6a5f8cca90389db39038dd7031e4 100644
--- a/ash/common/system/tray/system_tray_controller.h
+++ b/ash/common/system/tray/system_tray_controller.h
@@ -5,7 +5,9 @@
#ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
#define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
+#include "ash/ash_export.h"
#include "ash/public/interfaces/system_tray.mojom.h"
+#include "base/compiler_specific.h"
#include "base/i18n/time_formatting.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
@@ -29,7 +31,8 @@ namespace ash {
//
// TODO: Consider renaming this to SystemTrayClient or renaming the current
// SystemTray to SystemTrayView and making this class SystemTray.
-class SystemTrayController : public mojom::SystemTray {
+class ASH_EXPORT SystemTrayController
+ : NON_EXPORTED_BASE(public mojom::SystemTray) {
public:
explicit SystemTrayController(shell::Connector* connector);
~SystemTrayController() override;
@@ -49,6 +52,7 @@ class SystemTrayController : public mojom::SystemTray {
void ShowPaletteHelp();
void ShowPaletteSettings();
void ShowPublicAccountInfo();
+ void ShowNetworkConfigure(const std::string& network_id);
void ShowNetworkSettings(const std::string& network_id);
void ShowProxySettings();
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray_controller.cc » ('j') | ash/mus/network_connect_delegate_mus.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698