ash uber tray: Make it work in ash_shell, and a couple more fixes.

ash/shell/shell_main.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 <map>
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
@@ skipping 147 matching lines @@
  public:
   ShellDelegateImpl() : watcher_(NULL), launcher_delegate_(NULL) {}
 
   void SetWatcher(WindowWatcher* watcher) {
     watcher_ = watcher;
     if (launcher_delegate_)
       launcher_delegate_->set_watcher(watcher);
   }
 
   virtual views::Widget* CreateStatusArea() OVERRIDE {
-    return ash::internal::CreateStatusArea();
+    return NULL;
   }
 
 #if defined(OS_CHROMEOS)
  virtual void LockScreen() OVERRIDE {
    ash::shell::CreateLockScreen();
  }
 #endif
 
   virtual void Exit() OVERRIDE {
     MessageLoopForUI::current()->Quit();
@@ skipping 84 matching lines @@
   window_watcher.reset();
 
   ash::Shell::DeleteInstance();
 
   aura::Env::DeleteInstance();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }