Aura: Add --aura-laptop-mode to fill the workspace with a single window.

ui/aura_shell/shell.cc

 // Copyright (c) 2011 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 "ui/aura_shell/shell.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/app_list.h"
 #include "ui/aura_shell/default_container_event_filter.h"
 #include "ui/aura_shell/default_container_layout_manager.h"
 #include "ui/aura_shell/root_window_event_filter.h"
 #include "ui/aura_shell/root_window_layout_manager.h"
 #include "ui/aura_shell/drag_drop_controller.h"
+#include "ui/aura_shell/laptop_mode_layout_manager.h"
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/modal_container_layout_manager.h"
 #include "ui/aura_shell/shadow_controller.h"
 #include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/shell_accelerator_controller.h"
 #include "ui/aura_shell/shell_accelerator_filter.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_tooltip_manager.h"
 #include "ui/aura_shell/shell_window_ids.h"
@@ skipping 17 matching lines @@
 // types in the shell UI. They are added to |containers| from back to front in
 // the z-index.
 void CreateSpecialContainers(aura::Window::Windows* containers) {
   aura::Window* background_container = new aura::Window(NULL);
   background_container->set_id(
       internal::kShellWindowId_DesktopBackgroundContainer);
   containers->push_back(background_container);
 
   aura::Window* default_container = new aura::Window(NULL);
   default_container->SetEventFilter(
       new ToplevelWindowEventFilter(default_container));

[sky, 2011/12/12 15:46:29]

Don't you want a different ToplevelWindowEventFilter too?

[James Cook, 2011/12/12 18:33:36]

Hmm.  If we want popups to be draggable windows, we need the existing event
filter.  But if not, we don't need a filter at all (the existing one only does
dragging).  I'll suppress creating of this filter for laptop mode.

   default_container->set_id(internal::kShellWindowId_DefaultContainer);
   containers->push_back(default_container);
 
   aura::Window* always_on_top_container = new aura::Window(NULL);
   always_on_top_container->SetEventFilter(
       new ToplevelWindowEventFilter(always_on_top_container));
   always_on_top_container->set_id(
       internal::kShellWindowId_AlwaysOnTopContainer);
   containers->push_back(always_on_top_container);
 
@@ skipping 115 matching lines @@
     (*i)->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     root_window->AddChild(*i);
     (*i)->Show();
   }
 
   internal::StackingController* stacking_controller =
       static_cast<internal::StackingController*>(
           root_window->stacking_client());
   stacking_controller->Init();
 
+  InitLayoutManagers(root_window);
+
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))
+    shadow_controller_.reset(new internal::ShadowController());
+
+  // Force a layout.
+  root_window->layout_manager()->OnWindowResized();
+
+  // Initialize ShellAcceleratorFilter
+  accelerator_filter_.reset(new internal::ShellAcceleratorFilter);
+  AddRootWindowEventFilter(accelerator_filter_.get());
+
+  // Initialize ShellTooltipManager
+  tooltip_manager_.reset(new ShellTooltipManager);
+  aura::RootWindow::GetInstance()->SetProperty(
+      aura::kRootWindowTooltipClientKey,
+      static_cast<aura::TooltipClient*>(tooltip_manager_.get()));
+  AddRootWindowEventFilter(tooltip_manager_.get());
+
+  // Initialize drag drop controller.
+  drag_drop_controller_.reset(new internal::DragDropController);
+  aura::RootWindow::GetInstance()->SetProperty(
+      aura::kRootWindowDragDropClientKey,
+      static_cast<aura::DragDropClient*>(drag_drop_controller_.get()));
+}
+
+void Shell::InitLayoutManagers(aura::RootWindow* root_window) {
   internal::RootWindowLayoutManager* root_window_layout =
       new internal::RootWindowLayoutManager(root_window);
   root_window->SetLayoutManager(root_window_layout);
 
-  root_window_layout->set_background_widget(
-      internal::CreateDesktopBackground());
-  aura::Window* default_container =
-      GetContainer(internal::kShellWindowId_DefaultContainer);
-  launcher_.reset(new Launcher(default_container));
-
   views::Widget* status_widget = NULL;
   if (delegate_.get())
     status_widget = delegate_->CreateStatusArea();
   if (!status_widget)
     status_widget = internal::CreateStatusArea();
 
+  aura::Window* default_container =
+      GetContainer(internal::kShellWindowId_DefaultContainer);
+
+  // Laptop mode has a simplified layout manager and doesn't use the launcher,
+  // desktop background, shelf, etc.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraLaptopMode)) {
+    default_container->SetLayoutManager(
+        new internal::LaptopModeLayoutManager());
+    // TODO(jamescook): Adjust status area layout.
+    return;
+  }
+
+  root_window_layout->set_background_widget(
+      internal::CreateDesktopBackground());
+  launcher_.reset(new Launcher(default_container));
+
   internal::ShelfLayoutManager* shelf_layout_manager =
       new internal::ShelfLayoutManager(launcher_->widget(), status_widget);
   GetContainer(aura_shell::internal::kShellWindowId_LauncherContainer)->
       SetLayoutManager(shelf_layout_manager);
 
   internal::StatusAreaLayoutManager* status_area_layout_manager =
       new internal::StatusAreaLayoutManager(shelf_layout_manager);
   GetContainer(aura_shell::internal::kShellWindowId_StatusContainer)->
       SetLayoutManager(status_area_layout_manager);
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))
-    shadow_controller_.reset(new internal::ShadowController());
-
+  // Workspace manager has its own layout managers.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraWindows)) {
     EnableWorkspaceManager();
-  } else {
-    internal::ToplevelLayoutManager* toplevel_layout_manager =
-        new internal::ToplevelLayoutManager();
-    default_container->SetLayoutManager(toplevel_layout_manager);
-    toplevel_layout_manager->set_shelf(shelf_layout_manager);
+    return;
   }
 
-  // Force a layout.
-  root_window_layout->OnWindowResized();
-
-  // Initialize ShellAcceleratorFilter
-  accelerator_filter_.reset(new internal::ShellAcceleratorFilter);
-  AddRootWindowEventFilter(accelerator_filter_.get());
-
-  // Initialize ShellTooltipManager
-  tooltip_manager_.reset(new ShellTooltipManager);
-  aura::RootWindow::GetInstance()->SetProperty(
-      aura::kRootWindowTooltipClientKey,
-      static_cast<aura::TooltipClient*>(tooltip_manager_.get()));
-  AddRootWindowEventFilter(tooltip_manager_.get());
-
-  // Initialize drag drop controller.
-  drag_drop_controller_.reset(new internal::DragDropController);
-  aura::RootWindow::GetInstance()->SetProperty(
-      aura::kRootWindowDragDropClientKey,
-      static_cast<aura::DragDropClient*>(drag_drop_controller_.get()));
+  // Default layout manager.
+  internal::ToplevelLayoutManager* toplevel_layout_manager =
+      new internal::ToplevelLayoutManager();
+  default_container->SetLayoutManager(toplevel_layout_manager);
+  toplevel_layout_manager->set_shelf(shelf_layout_manager);
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const aura_shell::Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return aura::RootWindow::GetInstance()->GetChildById(container_id);
 }
@@ skipping 30 matching lines @@
       new internal::WorkspaceController(default_container));
   workspace_controller_->SetLauncherModel(launcher_->model());
   default_container->SetEventFilter(
       new internal::DefaultContainerEventFilter(default_container));
   default_container->SetLayoutManager(
       new internal::DefaultContainerLayoutManager(
           workspace_controller_->workspace_manager()));
 }
 
 }  // namespace aura_shell