Ash: Remove compact window mode.

ash/shell.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/settings/tray_settings.h"
 #include "ash/system/power/power_status_controller.h"
 #include "ash/system/power/tray_power_date.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_empty.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/base_layout_manager.h"
-#include "ash/wm/compact_layout_manager.h"
-#include "ash/wm/compact_status_area_layout_manager.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/panel_window_event_filter.h"
 #include "ash/wm/panel_layout_manager.h"
 #include "ash/wm/partial_screenshot_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/root_window_event_filter.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/shadow_controller.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 210 matching lines @@
 // static
 Shell* Shell::instance_ = NULL;
 // static
 bool Shell::initially_hide_cursor_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell::TestApi
 
 Shell::TestApi::TestApi(Shell* shell) : shell_(shell) {}
 
-Shell::WindowMode Shell::TestApi::ComputeWindowMode(CommandLine* cmd) const {
-  return shell_->ComputeWindowMode(cmd);
-}
-
 internal::RootWindowLayoutManager* Shell::TestApi::root_window_layout() {
   return shell_->root_window_layout_;
 }
 
 internal::InputMethodEventFilter* Shell::TestApi::input_method_event_filter() {
   return shell_->input_method_filter_.get();
 }
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
   return shell_->workspace_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : root_window_(new aura::RootWindow),
+      root_filter_(NULL),
       delegate_(delegate),
       audio_controller_(NULL),
       brightness_controller_(NULL),
+      power_status_controller_(NULL),
       shelf_(NULL),
-      window_mode_(MODE_MANAGED),
       desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
@@ skipping 92 matching lines @@
   // order) since they have the second highest priority.
   DCHECK_EQ(1U, GetRootWindowEventFilterCount());
 #if !defined(OS_MACOSX)
   accelerator_filter_.reset(new internal::AcceleratorFilter);
   AddRootWindowEventFilter(accelerator_filter_.get());
   DCHECK_EQ(2U, GetRootWindowEventFilterCount());
 #endif
   input_method_filter_.reset(new internal::InputMethodEventFilter);
   AddRootWindowEventFilter(input_method_filter_.get());
 
-  // Window mode must be set before computing containers or layout managers.
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!delegate_.get() || !delegate_->GetOverrideWindowMode(&window_mode_))
-    window_mode_ = ComputeWindowMode(command_line);
-
   aura::RootWindow* root_window = GetRootWindow();
   root_window->SetCursor(aura::kCursorPointer);
   if (initially_hide_cursor_)
     root_window->ShowCursor(false);
 
   activation_controller_.reset(new internal::ActivationController);
 
   CreateSpecialContainers(root_window);
 
   stacking_controller_.reset(new internal::StackingController);
 
   root_window_layout_ = new internal::RootWindowLayoutManager(root_window);
   root_window->SetLayoutManager(root_window_layout_);
 
   if (delegate_.get())
     status_widget_ = delegate_->CreateStatusArea();
 
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAshUberTray)) {
     // TODO(sad): This is rather ugly at the moment. This is because we are
     // supporting both the old and the new status bar at the same time. This
     // will soon get better once the new one is ready and the old one goes out
     // the door.
     tray_.reset(new SystemTray());
     if (status_widget_) {
       status_widget_->GetContentsView()->RemoveAllChildViews(false);
       status_widget_->GetContentsView()->AddChildView(tray_.get());
     }
@@ skipping 17 matching lines @@
     tray_->AddTrayItem(tray_brightness);
     tray_->AddTrayItem(new internal::TraySettings());
   }
   if (!status_widget_)
     status_widget_ = internal::CreateStatusArea(tray_.get());
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
-  if (window_mode_ == MODE_COMPACT)
-    SetupCompactWindowMode();
-  else
-    SetupManagedWindowMode();
+  InitLayoutManagers();
 
   if (!command_line->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
 
   focus_cycler_.reset(new internal::FocusCycler());
   focus_cycler_->AddWidget(status_widget_);
   focus_cycler_->AddWidget(launcher_->widget());
   launcher_->SetFocusCycler(focus_cycler_.get());
 
   // Force a layout.
   root_window->layout_manager()->OnWindowResized();
 
   window_modality_controller_.reset(new internal::WindowModalityController);
   AddRootWindowEventFilter(window_modality_controller_.get());
 
   visibility_controller_.reset(new internal::VisibilityController);
 
   tooltip_controller_.reset(new internal::TooltipController);
   AddRootWindowEventFilter(tooltip_controller_.get());
 
   drag_drop_controller_.reset(new internal::DragDropController);
   power_button_controller_.reset(new PowerButtonController);
   video_detector_.reset(new VideoDetector);
   window_cycle_controller_.reset(new WindowCycleController);
 }
 
-Shell::WindowMode Shell::ComputeWindowMode(CommandLine* command_line) const {
-  // Some devices don't perform well with overlapping windows.
-  if (command_line->HasSwitch(switches::kAuraForceCompactWindowMode))
-    return MODE_COMPACT;
-
-  // If user set the flag, use their desired behavior.
-  if (command_line->HasSwitch(switches::kAuraWindowMode)) {
-    std::string mode =
-        command_line->GetSwitchValueASCII(switches::kAuraWindowMode);
-    if (mode == switches::kAuraWindowModeCompact)
-      return MODE_COMPACT;
-    if (mode == switches::kAuraWindowModeManaged)
-      return MODE_MANAGED;
-  }
-
-  // Managed is the default.
-  return Shell::MODE_MANAGED;
-}
-
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return GetRootWindow()->GetChildById(container_id);
 }
 
 void Shell::AddRootWindowEventFilter(aura::EventFilter* filter) {
@@ skipping 49 matching lines @@
       internal::kShellWindowId_LockScreenContainer);
   return lock_screen_container->StopsEventPropagation();
 }
 
 bool Shell::IsModalWindowOpen() const {
   const aura::Window* modal_container = GetContainer(
       internal::kShellWindowId_SystemModalContainer);
   return !modal_container->children().empty();
 }
 
-void Shell::SetCompactStatusAreaOffset(gfx::Size& offset) {
-  compact_status_area_offset_ = offset;
-
-  // Trigger a relayout.
-  if (IsWindowModeCompact()) {
-    aura::LayoutManager* layout_manager = GetContainer(
-        internal::kShellWindowId_StatusContainer)->layout_manager();
-    if (layout_manager)
-      layout_manager->OnWindowResized();
-  }
-}
-
 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAuraGoogleDialogFrames)) {
     return new internal::DialogFrameView;
   }
-  // Normal non-compact-mode gets translucent-style window frames for dialogs.
-  if (!IsWindowModeCompact()) {
-    internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh;
-    frame_view->Init(widget);
-    return frame_view;
-  }
-  return NULL;
+  // Use translucent-style window frames for dialogs.
+  internal::CustomFrameViewAsh* frame_view = new internal::CustomFrameViewAsh;
+  frame_view->Init(widget);
+  return frame_view;
 }
 
 void Shell::RotateFocus(Direction direction) {
   focus_cycler_->RotateFocus(
       direction == FORWARD ? internal::FocusCycler::FORWARD :
                              internal::FocusCycler::BACKWARD);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
-// Compact mode has a simplified layout manager and doesn't use the shelf,
-// desktop background, etc.  The launcher still exists so we can use its
-// data model and list of open windows, but we hide the UI to save space.
-void Shell::SetupCompactWindowMode() {
+void Shell::InitLayoutManagers() {
   DCHECK(root_window_layout_);
   DCHECK(status_widget_);
 
-  // Don't use an event filter for the default container, as we don't support
-  // window dragging, double-click to maximize, etc.
-  aura::Window* default_container =
-      GetContainer(internal::kShellWindowId_DefaultContainer);
-  default_container->SetEventFilter(NULL);
-
-  // Set up our new layout managers.
-  internal::CompactLayoutManager* compact_layout_manager =
-      new internal::CompactLayoutManager();
-  compact_layout_manager->set_status_area_widget(status_widget_);
-  internal::CompactStatusAreaLayoutManager* status_area_layout_manager =
-      new internal::CompactStatusAreaLayoutManager(status_widget_);
-  GetContainer(internal::kShellWindowId_StatusContainer)->
-      SetLayoutManager(status_area_layout_manager);
-  default_container->SetLayoutManager(compact_layout_manager);
-
-  // Keep the launcher for its data model, but hide it.  Do this before
-  // maximizing the windows so the work area is the right size.
-  launcher_->widget()->Hide();
-
-  // Set a solid black background.
-  SetDesktopBackgroundMode(BACKGROUND_SOLID_COLOR);
-}
-
-void Shell::SetupManagedWindowMode() {
-  DCHECK(root_window_layout_);
-  DCHECK(status_widget_);
-
   internal::ShelfLayoutManager* shelf_layout_manager =
       new internal::ShelfLayoutManager(launcher_->widget(), status_widget_);
   GetContainer(internal::kShellWindowId_LauncherContainer)->
       SetLayoutManager(shelf_layout_manager);
   shelf_ = shelf_layout_manager;
 
   internal::StatusAreaLayoutManager* status_area_layout_manager =
       new internal::StatusAreaLayoutManager(shelf_layout_manager);
   GetContainer(internal::kShellWindowId_StatusContainer)->
       SetLayoutManager(status_area_layout_manager);
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   // Workspace manager has its own layout managers.
   workspace_controller_.reset(
       new internal::WorkspaceController(default_container));
   workspace_controller_->workspace_manager()->set_shelf(shelf_layout_manager);
 
   // Ensure launcher is visible.
   launcher_->widget()->Show();
 
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
-void Shell::ResetLayoutManager(int container_id) {
-  GetContainer(container_id)->SetLayoutManager(NULL);
-}
-
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash