Add ash UI for third-party VPNs

ui/chromeos/network/network_list.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/chromeos/network/network_list.h"
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/network/network_state.h"
@@ skipping 13 matching lines @@
 using chromeos::NetworkHandler;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
 
 namespace ui {
 
 // NetworkListView:
 
 NetworkListView::NetworkListView(NetworkListDelegate* delegate)
     : delegate_(delegate),
-      content_(NULL),
       scanning_view_(NULL),
       no_wifi_networks_view_(NULL),
       no_cellular_networks_view_(NULL) {
-  CHECK(delegate);
+  CHECK(delegate_);
 }
 
 NetworkListView::~NetworkListView() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
-void NetworkListView::UpdateNetworkList() {
-  CHECK(content_);
+void NetworkListView::Update() {
+  CHECK(container_);
   NetworkStateHandler::NetworkStateList network_list;
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   handler->GetVisibleNetworkList(&network_list);
   UpdateNetworks(network_list);
   UpdateNetworkIcons();
   UpdateNetworkListInternal();
 }
 
-bool NetworkListView::IsViewInList(views::View* view,
-                                   std::string* service_path) const {
+bool NetworkListView::IsNetworkEntry(views::View* view,
+                                     std::string* service_path) const {
   std::map<views::View*, std::string>::const_iterator found =
       network_map_.find(view);
   if (found == network_map_.end())
     return false;
   *service_path = found->second;
   return true;
 }
 
 void NetworkListView::UpdateNetworks(
     const NetworkStateHandler::NetworkStateList& networks) {
@@ skipping 49 matching lines @@
   bool needs_relayout = UpdateNetworkListEntries(&new_service_paths);
 
   // Remove old children
   std::set<std::string> remove_service_paths;
   for (ServicePathMap::const_iterator it = service_path_map_.begin();
        it != service_path_map_.end();
        ++it) {
     if (new_service_paths.find(it->first) == new_service_paths.end()) {
       remove_service_paths.insert(it->first);
       network_map_.erase(it->second);
-      content_->RemoveChildView(it->second);
+      container_->RemoveChildView(it->second);
       needs_relayout = true;
     }
   }
 
   for (std::set<std::string>::const_iterator remove_it =
            remove_service_paths.begin();
        remove_it != remove_service_paths.end();
        ++remove_it) {
     service_path_map_.erase(*remove_it);
   }
 
   if (needs_relayout)
     HandleRelayout();
 }
 
 void NetworkListView::HandleRelayout() {
   views::View* selected_view = NULL;
   for (auto& iter : service_path_map_) {
     if (delegate_->IsViewHovered(iter.second)) {
       selected_view = iter.second;
       break;
     }
   }
-  content_->SizeToPreferredSize();
+  container_->SizeToPreferredSize();
   delegate_->RelayoutScrollList();
   if (selected_view)
-    content_->ScrollRectToVisible(selected_view->bounds());
+    container_->ScrollRectToVisible(selected_view->bounds());
 }
 
 bool NetworkListView::UpdateNetworkListEntries(
     std::set<std::string>* new_service_paths) {
   bool needs_relayout = false;
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // Insert child views
   int index = 0;
 
@@ skipping 38 matching lines @@
     if (message_id)
       ++index;
   }
 
   // Un-highlighted networks
   needs_relayout |= UpdateNetworkChildren(new_service_paths, &index,
                                           false /* not highlighted */);
 
   // No networks or other messages (fallback)
   if (index == 0) {
-    int message_id = 0;
-    if (pattern.Equals(NetworkTypePattern::VPN()))
-      message_id = IDS_ASH_STATUS_TRAY_NETWORK_NO_VPN;
-    else
-      message_id = IDS_ASH_STATUS_TRAY_NO_NETWORKS;
-    needs_relayout |= UpdateInfoLabel(message_id, index, &scanning_view_);
+    needs_relayout |= UpdateInfoLabel(IDS_ASH_STATUS_TRAY_NO_NETWORKS, index,
+                                      &scanning_view_);
   }
 
   return needs_relayout;
 }
 
 bool NetworkListView::UpdateNetworkChildren(
     std::set<std::string>* new_service_paths,
     int* child_index,
     bool highlighted) {
   bool needs_relayout = false;
   int index = *child_index;
   for (auto& info : network_list_) {
     if (info->highlight != highlighted)
       continue;
     needs_relayout |= UpdateNetworkChild(index++, info);
     new_service_paths->insert(info->service_path);
   }
   *child_index = index;
   return needs_relayout;
 }
 
 bool NetworkListView::UpdateNetworkChild(int index, const NetworkInfo* info) {
   bool needs_relayout = false;
   views::View* container = NULL;
   ServicePathMap::const_iterator found =
       service_path_map_.find(info->service_path);
   if (found == service_path_map_.end()) {
     container = delegate_->CreateViewForNetwork(*info);
-    content_->AddChildViewAt(container, index);
+    container_->AddChildViewAt(container, index);
     needs_relayout = true;
   } else {
     container = found->second;
     container->RemoveAllChildViews(true);
     delegate_->UpdateViewForNetwork(container, *info);
     container->Layout();
     container->SchedulePaint();
     needs_relayout = PlaceViewAtIndex(container, index);
   }
   if (info->disable)
     container->SetEnabled(false);
   network_map_[container] = info->service_path;
   service_path_map_[info->service_path] = container;
   return needs_relayout;
 }
 
 bool NetworkListView::PlaceViewAtIndex(views::View* view, int index) {
-  if (content_->child_at(index) == view)
+  if (container_->child_at(index) == view)
     return false;
-  content_->ReorderChildView(view, index);
+  container_->ReorderChildView(view, index);
   return true;
 }
 
 bool NetworkListView::UpdateInfoLabel(int message_id,
                                       int index,
                                       views::Label** label) {
   CHECK(label);
   bool needs_relayout = false;
   if (message_id) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     base::string16 text = rb.GetLocalizedString(message_id);
     if (!*label) {
       *label = delegate_->CreateInfoLabel();
       (*label)->SetText(text);
-      content_->AddChildViewAt(*label, index);
+      container_->AddChildViewAt(*label, index);
       needs_relayout = true;
     } else {
       (*label)->SetText(text);
       needs_relayout = PlaceViewAtIndex(*label, index);
     }
   } else if (*label) {
-    content_->RemoveChildView(*label);
+    container_->RemoveChildView(*label);
     delete *label;
     *label = NULL;
     needs_relayout = true;
   }
   return needs_relayout;
 }
 
 void NetworkListView::NetworkIconChanged() {
-  UpdateNetworkList();
+  Update();
 }
 
 }  // namespace ui