Revert of Support modal windows

athena/system/status_icon_container_view.cc

Index: athena/system/status_icon_container_view.cc
diff --git a/athena/system/status_icon_container_view.cc b/athena/system/status_icon_container_view.cc
index a7c5f85b98b92ed039cb7de17a037fb46c501a13..811c645cfa8d3a6e11953c1ba0f48d2bd54ea977 100644
--- a/athena/system/status_icon_container_view.cc
+++ b/athena/system/status_icon_container_view.cc
@@ -208,7 +208,9 @@
 };
 
 StatusIconContainerView::StatusIconContainerView(
-    SystemUI::ColorScheme color_scheme) {
+    SystemUI::ColorScheme color_scheme,
+    aura::Window* system_modal_container)
+    : system_modal_container_(system_modal_container) {
   const int kHorizontalSpacing = 10;
   const int kVerticalSpacing = 3;
   const int kBetweenChildSpacing = 10;
@@ -239,13 +241,13 @@
 }
 
 bool StatusIconContainerView::OnMousePressed(const ui::MouseEvent& event) {
-  CreateNetworkSelector();
+  CreateNetworkSelector(system_modal_container_);
   return true;
 }
 
 void StatusIconContainerView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP) {
-    CreateNetworkSelector();
+    CreateNetworkSelector(system_modal_container_);
     event->SetHandled();
   }
 }