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

Unified Diff: ash/system/chromeos/network/tray_vpn.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix single-letter typo :(. Created 8 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/system/chromeos/network/tray_vpn.h ('k') | ash/system/chromeos/tray_display.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/tray_vpn.cc
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
index f54413888a0d490642d33c411f77944d2da8626e..75db6a192b0d72e713c8781a2a286df37edd0f76 100644
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ b/ash/system/chromeos/network/tray_vpn.cc
@@ -40,8 +40,10 @@ class VpnDefaultView : public TrayItemMore {
class VpnListDetailedView : public NetworkListDetailedViewBase {
public:
- VpnListDetailedView(user::LoginStatus login, int header_string_id)
- : NetworkListDetailedViewBase(login, header_string_id),
+ VpnListDetailedView(SystemTrayItem* owner,
+ user::LoginStatus login,
+ int header_string_id)
+ : NetworkListDetailedViewBase(owner, login, header_string_id),
other_vpn_(NULL) {
}
virtual ~VpnListDetailedView() {
@@ -116,8 +118,9 @@ class VpnListDetailedView : public NetworkListDetailedViewBase {
} // namespace tray
-TrayVPN::TrayVPN()
- : default_(NULL),
+TrayVPN::TrayVPN(SystemTray* system_tray)
+ : SystemTrayItem(system_tray),
+ default_(NULL),
detailed_(NULL) {
}
@@ -145,7 +148,8 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
views::View* TrayVPN::CreateDetailedView(user::LoginStatus status) {
CHECK(detailed_ == NULL);
- detailed_ = new tray::VpnListDetailedView(status, IDS_ASH_STATUS_TRAY_VPN);
+ detailed_ = new tray::VpnListDetailedView(
+ this, status, IDS_ASH_STATUS_TRAY_VPN);
detailed_->Init();
return detailed_;
}
« no previous file with comments | « ash/system/chromeos/network/tray_vpn.h ('k') | ash/system/chromeos/tray_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698