Positions the launcher in the bottom left corner. Adds ShellDelegate

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 "grit/ui_resources.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/toplevel_window_container.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/desktop_layout_manager.h"
 #include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_window_ids.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/image/image.h"
-#include "views/controls/button/image_button.h"
 #include "views/widget/widget.h"
 
 namespace aura_shell {
 
 namespace {
+
 // Creates each of the special window containers that holds windows of various
 // 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::ToplevelWindowContainer;
@@ skipping 16 matching lines @@
 
   aura::Window* status_container = new aura::Window(NULL);
   status_container->set_id(internal::kShellWindowId_StatusContainer);
   containers->push_back(status_container);
 
   aura::Window* menu_container = new aura::Window(NULL);
   menu_container->set_id(internal::kShellWindowId_MenusAndTooltipsContainer);
   containers->push_back(menu_container);
 }
 
+// Returns true if |window| has ancestor with the id |id|.
+bool WindowHasAncestorWithId(const aura::Window* window, int id) {
+  while (window && window->id() != id)
+    window = window->parent();
+  return window != NULL;
+}
+
 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
 
 void CalculateWindowBoundsAndScaleForTiling(
     const gfx::Size& containing_size,
     const aura::Window::Windows& windows,
     float* x_scale,
     float* y_scale,
     std::vector<WindowAndBoundsPair>* bounds) {
   *x_scale = 1.0f;
   *y_scale = 1.0f;
@@ skipping 43 matching lines @@
 
 }  // namespace
 
 // static
 Shell* Shell::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
-      new_browser_button_(NULL),
-      show_apps_button_(NULL) {
+    : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   aura::Desktop::GetInstance()->SetDelegate(this);
 }
 
 Shell::~Shell() {
 }
 
 // static
 Shell* Shell::GetInstance() {
   if (!instance_) {
     instance_ = new Shell;
     instance_->Init();
   }
   return instance_;
 }
 
 void Shell::Init() {
-  InitLauncherModel();
-
   aura::Window::Windows containers;
   CreateSpecialContainers(&containers);
   aura::Window::Windows::const_iterator i;
   for (i = containers.begin(); i != containers.end(); ++i) {
     (*i)->Init();
     aura::Desktop::GetInstance()->window()->AddChild(*i);
     (*i)->Show();
   }
 
   aura::Window* root_window = aura::Desktop::GetInstance()->window();
   internal::DesktopLayoutManager* desktop_layout =
       new internal::DesktopLayoutManager(root_window);
   root_window->SetLayoutManager(desktop_layout);
 
   desktop_layout->set_background_widget(internal::CreateDesktopBackground());
-  desktop_layout->set_launcher_widget(
-      internal::CreateLauncher(launcher_model_.get()));
+  desktop_layout->set_launcher_widget(internal::CreateLauncher());
   desktop_layout->set_status_area_widget(internal::CreateStatusArea());
 }
 
 void Shell::SetDelegate(ShellDelegate* delegate) {
   delegate_.reset(delegate);
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const aura_shell::Shell*>(this)->GetContainer(container_id));
@@ skipping 41 matching lines @@
   for (size_t i = 0; i < to_restore_.size(); ++i) {
     to_restore_[i].first->layer()->SetAnimation(
         aura::Window::CreateDefaultAnimation());
     to_restore_[i].first->SetBounds(to_restore_[i].second);
     to_restore_[i].first->layer()->SetTransform(identity_transform);
     to_restore_[i].first->layer()->SetOpacity(1.0f);
   }
   to_restore_.clear();
 }
 
-void Shell::InitLauncherModel() {
-  launcher_model_.reset(new LauncherModel);
-
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  new_browser_button_ = new views::ImageButton(this);
-  new_browser_button_->SetImage(
-      views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_CHROME).ToSkBitmap());
-  launcher_model_->AddItem(new_browser_button_, 0, false);
-
-  show_apps_button_ = new views::ImageButton(this);
-  show_apps_button_->SetImage(
-      views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
-  launcher_model_->AddItem(show_apps_button_, 1, false);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::DesktopDelegate implementation:
 
 void Shell::AddChildToDefaultParent(aura::Window* window) {
   aura::Window* parent = NULL;
   switch (window->type()) {
     case aura::kWindowType_Toplevel:
       parent = GetContainer(internal::kShellWindowId_DefaultContainer);
       break;
     case aura::kWindowType_Menu:
     case aura::kWindowType_Tooltip:
       parent = GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);
       break;
     default:
       // This will crash for controls, since they can't be parented to anything.
       break;
   }
   parent->AddChild(window);
 }
 
 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const {
   const aura::ToplevelWindowContainer* container =
       GetContainer(internal::kShellWindowId_DefaultContainer)->
           AsToplevelWindowContainer();
   return container->GetTopmostWindowToActivate(ignore);
 }
 
-void Shell::ButtonPressed(views::Button* sender,
-                          const views::Event& event) {
-  if (sender == new_browser_button_ && delegate_.get())
-    delegate_->CreateNewWindow();
-  else if (sender == show_apps_button_ && delegate_.get())
-    delegate_->ShowApps();
+void Shell::WindowAdded(aura::Window* window) {

[Ben Goodger (Google), 2011/10/13 03:03:39]

Seems like you don't want to listen to all window adds/removes... just additions
to the DefaultWindowContainer. Other items wouldn't show up in the launcher...

Makes me think there should be a WindowObserver, and then the shell, as creator
of the DefaultWindowContainer, could register itself as an observer of that
particular window.

+  if (!delegate_.get())
+    return;
+  aura::Window* top_level = window->GetToplevelWindow();
+  // Ignore non-top level windows.
+  if (top_level != window || !WindowHasAncestorWithId(window,
+          internal::kShellWindowId_DefaultContainer))
+    return;
+  LauncherItem item;
+  item.window = window;
+  if (!delegate_->ConfigureLauncherItem(&item))
+    return;  // The delegate doesn't want to show this item in the launcher.
+  LauncherModel* model = LauncherModel::instance();
+  model->Add(model->items().size(), item);
+}
+
+void Shell::WillRemoveWindow(aura::Window* window) {
+  LauncherModel* model = LauncherModel::instance();
+  const LauncherItems& items(model->items());
+  for (LauncherItems::const_iterator i = items.begin(); i != items.end(); ++i) {
+    if (i->window == window) {
+      model->RemoveItemAt(i - items.begin());
+      break;
+    }
+  }
 }
 
 }  // namespace aura_shell