Revert of Support modal windows

athena/system/status_icon_container_view.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 "athena/system/status_icon_container_view.h"
 
 #include "athena/resources/athena_resources.h"
 #include "athena/system/network_selector.h"
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 190 matching lines @@
   }
 
  private:
   SystemUI::ColorScheme color_scheme_;
   views::ImageView* icon_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateStatus);
 };
 
 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;
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                         kHorizontalSpacing,
                                         kVerticalSpacing,
                                         kBetweenChildSpacing));
 
   std::string version_text =
       base::StringPrintf("%s (Build %s)", PRODUCT_VERSION, LAST_CHANGE);
@@ skipping 10 matching lines @@
 
   views::ImageView* update_view = new views::ImageView();
   AddChildView(update_view);
   update_status_.reset(new UpdateStatus(color_scheme, update_view));
 }
 
 StatusIconContainerView::~StatusIconContainerView() {
 }
 
 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();
   }
 }
 
 void StatusIconContainerView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 }  // namespace athena