OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "ash/system/chromeos/network/tray_vpn.h" | 5 #include "ash/system/chromeos/network/tray_vpn.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/chromeos/network/network_list_detailed_view_base.h" | 8 #include "ash/system/chromeos/network/network_list_detailed_view_base.h" |
9 #include "ash/system/tray/system_tray_delegate.h" | 9 #include "ash/system/tray/system_tray_delegate.h" |
10 #include "ash/system/tray/tray_constants.h" | 10 #include "ash/system/tray/tray_constants.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 detailed_(NULL) { | 121 detailed_(NULL) { |
122 } | 122 } |
123 | 123 |
124 TrayVPN::~TrayVPN() { | 124 TrayVPN::~TrayVPN() { |
125 } | 125 } |
126 | 126 |
127 views::View* TrayVPN::CreateTrayView(user::LoginStatus status) { | 127 views::View* TrayVPN::CreateTrayView(user::LoginStatus status) { |
128 return NULL; | 128 return NULL; |
129 } | 129 } |
130 | 130 |
131 views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) { | 131 views::View* TrayVPN::CreateDefaultView(user::LoginStatus status, |
| 132 int bubble_width) { |
132 CHECK(default_ == NULL); | 133 CHECK(default_ == NULL); |
133 if (status == user::LOGGED_IN_NONE) | 134 if (status == user::LOGGED_IN_NONE) |
134 return NULL; | 135 return NULL; |
135 | 136 |
136 // Do not show VPN line in uber tray bubble if VPN is not configured. | 137 // Do not show VPN line in uber tray bubble if VPN is not configured. |
137 std::vector<NetworkIconInfo> list; | 138 std::vector<NetworkIconInfo> list; |
138 Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(&list); | 139 Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(&list); |
139 if (list.size() == 0) | 140 if (list.size() == 0) |
140 return NULL; | 141 return NULL; |
141 | 142 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 } | 190 } |
190 | 191 |
191 void TrayVPN::ClearNetworkMessage(MessageType message_type) { | 192 void TrayVPN::ClearNetworkMessage(MessageType message_type) { |
192 } | 193 } |
193 | 194 |
194 void TrayVPN::OnWillToggleWifi() { | 195 void TrayVPN::OnWillToggleWifi() { |
195 } | 196 } |
196 | 197 |
197 } // namespace internal | 198 } // namespace internal |
198 } // namespace ash | 199 } // namespace ash |
OLD | NEW |