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

Unified Diff: ash/common/wm_shell.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/system_tray_delegate.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 2c7a1548972c36a3c193ec513650f6f6a71cd521..b7adf68b69edb12a1230eb3f5a131ec648ae1cdd 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -93,6 +93,7 @@ class WindowState;
#if defined(OS_CHROMEOS)
class LogoutConfirmationController;
+class VpnList;
#endif
// Similar to ash::Shell. Eventually the two will be merged.
@@ -425,6 +426,8 @@ class ASH_EXPORT WmShell {
return logout_confirmation_controller_.get();
}
+ VpnList* vpn_list() { return vpn_list_.get(); }
+
// TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
virtual void ToggleIgnoreExternalKeyboard() = 0;
@@ -513,6 +516,7 @@ class ASH_EXPORT WmShell {
#if defined(OS_CHROMEOS)
std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
+ std::unique_ptr<VpnList> vpn_list_;
#endif
};
« no previous file with comments | « ash/common/system/tray/system_tray_delegate.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698