aura: Make aura::TooltipClient completely static?

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"
@@ skipping 107 matching lines @@
   aura::Desktop::GetInstance()->SetStackingClient(
       new internal::StackingController);
 }
 
 Shell::~Shell() {
   RemoveDesktopEventFilter(accelerator_filter_.get());
 
   // ShellTooltipManager needs a valid shell instance. We delete it before
   // deleting the shell |instance_|.
   RemoveDesktopEventFilter(tooltip_manager_.get());
-  aura::Desktop::GetInstance()->SetProperty(aura::kDesktopTooltipClientKey,
-      NULL);
+  tooltip_manager_.reset();
 
   // Make sure we delete WorkspaceController before launcher is
   // deleted as it has a reference to launcher model.
   workspace_controller_.reset();
   launcher_.reset();
 
   // Delete containers now so that child windows does not access
   // observers when they are destructed. This has to be after launcher
   // is destructed because launcher closes the widget in its destructor.
   aura::Desktop* desktop_window = aura::Desktop::GetInstance();
   while (!desktop_window->children().empty()) {
     aura::Window* child = desktop_window->children()[0];
     delete child;
   }
 
-  tooltip_manager_.reset();
-
   // Drag drop controller needs a valid shell instance. We destroy it first.
   drag_drop_controller_.reset();
 
   DCHECK(instance_ == this);
   instance_ = NULL;
 }
 
 // static
 Shell* Shell::CreateInstance(ShellDelegate* delegate) {
   CHECK(!instance_);
@@ skipping 65 matching lines @@
 
   // Force a layout.
   desktop_layout->OnWindowResized();
 
   // Initialize ShellAcceleratorFilter
   accelerator_filter_.reset(new internal::ShellAcceleratorFilter);
   AddDesktopEventFilter(accelerator_filter_.get());
 
   // Initialize ShellTooltipManager
   tooltip_manager_.reset(new ShellTooltipManager);
-  aura::Desktop::GetInstance()->SetProperty(aura::kDesktopTooltipClientKey,
-      static_cast<aura::TooltipClient*>(tooltip_manager_.get()));
   AddDesktopEventFilter(tooltip_manager_.get());
 
   // Initialize drag drop controller.
   drag_drop_controller_.reset(new internal::DragDropController);
   aura::Desktop::GetInstance()->SetProperty(aura::kDesktopDragDropClientKey,
       static_cast<aura::DragDropClient*>(drag_drop_controller_.get()));
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
@@ skipping 36 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