Revert of Support modal windows

athena/system/status_icon_container_view.h

Index: athena/system/status_icon_container_view.h
diff --git a/athena/system/status_icon_container_view.h b/athena/system/status_icon_container_view.h
index 6e77b49664452fab0e96fc3d3756ec7d35ba80f1..ec604883d42c031619ddddaf246c1b7ed340409c 100644
--- a/athena/system/status_icon_container_view.h
+++ b/athena/system/status_icon_container_view.h
@@ -9,12 +9,17 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/view.h"
 
+namespace aura {
+class Window;
+}
+
 namespace athena {
 
 // View which displays the system tray icons.
 class StatusIconContainerView : public views::View {
  public:
-  StatusIconContainerView(SystemUI::ColorScheme color_scheme);
+  StatusIconContainerView(SystemUI::ColorScheme color_scheme,
+                          aura::Window* popup_container);
   virtual ~StatusIconContainerView();
 
  private:
@@ -22,6 +27,9 @@
   virtual bool OnMousePressed(const ui::MouseEvent& event) override;
   virtual void OnGestureEvent(ui::GestureEvent* event) override;
   virtual void ChildPreferredSizeChanged(views::View* child) override;
+
+  // Parent container that the "select network" dialog should use.
+  aura::Window* system_modal_container_;
 
   class PowerStatus;
   scoped_ptr<PowerStatus> power_status_;