Relands fixes for 106432, 107287 and 107401. These got reverted

ui/aura_shell/shell_delegate.h

 // 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.
 
 #ifndef UI_AURA_SHELL_SHELL_DELEGATE_H_
 #define UI_AURA_SHELL_SHELL_DELEGATE_H_
 #pragma once
 
 #include "base/callback.h"
 #include "ui/aura_shell/aura_shell_export.h"
@@ skipping 32 matching lines @@
       const gfx::Rect& bounds,
       const SetWidgetCallback& callback) = 0;
 
   // Invoked when the user clicks on a window entry in the launcher.
   virtual void LauncherItemClicked(const LauncherItem& item) = 0;
 
   // Invoked when a window is added. If the delegate wants the launcher to show
   // an entry for |item->window| it should configure |item| appropriately and
   // return true.
   virtual bool ConfigureLauncherItem(LauncherItem* item) = 0;
+
+  // Returns the resource id of the image to show on the button that creates a
+  // new browser window.
+  virtual int GetResourceIDForNewBrowserWindow() = 0;
 };
-
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_SHELL_DELEGATE_H_