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

ui/aura_shell/examples/aura_shell_main.cc

Index: ui/aura_shell/examples/aura_shell_main.cc
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc
index 07000479acb4fc1bdbe0fad1d1009ccfce42352d..93363a8102c5135594ac10bef33fecf46d3e6733 100644
--- a/ui/aura_shell/examples/aura_shell_main.cc
+++ b/ui/aura_shell/examples/aura_shell_main.cc
@@ -7,6 +7,7 @@
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura_shell/examples/toplevel_window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
@@ -92,6 +93,10 @@ class ShellDelegateImpl : public aura_shell::ShellDelegate {
     image_count = (image_count + 1) % 3;
     return true;  // Makes the entry show up in the launcher.
   }
+
+  virtual int GetResourceIDForNewBrowserWindow() OVERRIDE {
+    return IDR_AURA_LAUNCHER_ICON_CHROME;
+  }
 };
 
 }  // namespace