Revert of Support modal windows

athena/system/system_ui_impl.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/public/system_ui.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/system/background_controller.h"
 #include "athena/system/orientation_controller.h"
 #include "athena/system/shutdown_dialog.h"
 #include "athena/system/status_icon_container_view.h"
 #include "athena/system/time_view.h"
 #include "athena/util/container_priorities.h"
 #include "athena/util/fill_layout_manager.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
 
 namespace athena {
 namespace {
 
 SystemUI* instance = NULL;
 
 // View which positions the TimeView on the left and the StatusIconView on the
 // right.
 class SystemInfoView : public views::View {
  public:
-  SystemInfoView(SystemUI::ColorScheme color_scheme)
+  SystemInfoView(SystemUI::ColorScheme color_scheme,
+                 aura::Window* system_modal_container)
       : time_view_(new TimeView(color_scheme)),
-        status_icon_view_(new StatusIconContainerView(color_scheme)) {
+        status_icon_view_(
+            new StatusIconContainerView(color_scheme, system_modal_container)) {
     AddChildView(time_view_);
     AddChildView(status_icon_view_);
   }
 
   virtual ~SystemInfoView() {
   }
 
   // views::View:
   virtual gfx::Size GetPreferredSize() const override {
     // The view should be as wide as its parent view.
@@ skipping 24 matching lines @@
   views::View* time_view_;
   views::View* status_icon_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemInfoView);
 };
 
 class SystemUIImpl : public SystemUI {
  public:
   SystemUIImpl(scoped_refptr<base::TaskRunner> blocking_task_runner)
       : orientation_controller_(new OrientationController()),
-        background_container_(NULL) {
+        background_container_(NULL),
+        system_modal_container_(NULL) {
     orientation_controller_->InitWith(blocking_task_runner);
   }
 
   virtual ~SystemUIImpl() {
     // Stops file watching now if exists. Waiting until message loop shutdon
     // leads to FilePathWatcher crash.
     orientation_controller_->Shutdown();
   }
 
   void Init() {
     ScreenManager* screen_manager = ScreenManager::Get();
     background_container_ = screen_manager->CreateContainer(
         ScreenManager::ContainerParams("AthenaBackground", CP_BACKGROUND));
     background_container_->SetLayoutManager(
         new FillLayoutManager(background_container_));
+    ScreenManager::ContainerParams system_modal_params(
+        "AthenaSystemModalContainer", CP_SYSTEM_MODAL);
+    system_modal_params.can_activate_children = true;
+    system_modal_container_ =
+        screen_manager->CreateContainer(system_modal_params);
+    login_screen_system_modal_container_ = screen_manager->CreateContainer(
+        ScreenManager::ContainerParams("AthenaLoginScreenSystemModalContainer",
+                                       CP_LOGIN_SCREEN_SYSTEM_MODAL));
 
-    shutdown_dialog_.reset(new ShutdownDialog());
+    // Use |login_screen_system_modal_container_| for the power button's dialog
+    // because it needs to show over the login screen.
+    // TODO(pkotwicz): Pick the most appropriate container based on whether the
+    // user has logged in.
+    shutdown_dialog_.reset(
+        new ShutdownDialog(login_screen_system_modal_container_));
     background_controller_.reset(
         new BackgroundController(background_container_));
   }
 
- private:
-  // SystemUI:
   virtual void SetBackgroundImage(const gfx::ImageSkia& image) override {
     background_controller_->SetImage(image);
   }
 
   virtual views::View* CreateSystemInfoView(ColorScheme color_scheme) override {
-    return new SystemInfoView(color_scheme);
+    return new SystemInfoView(color_scheme, system_modal_container_);
   }
 
+ private:
   scoped_ptr<OrientationController> orientation_controller_;
   scoped_ptr<ShutdownDialog> shutdown_dialog_;
   scoped_ptr<BackgroundController> background_controller_;
 
   // The parent container for the background.
   aura::Window* background_container_;
 
   // The parent container used by system modal dialogs.
   aura::Window* system_modal_container_;
 
@@ skipping 22 matching lines @@
 }
 
 // static
 void SystemUI::Shutdown() {
   CHECK(instance);
   delete instance;
   instance = NULL;
 }
 
 }  // namespace athena