Reverting issues 8873036 and issues 8933010

ui/aura_shell/examples/aura_shell_main.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 "base/at_exit.h"
 #include "base/command_line.h"
 #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"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/window_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/canvas.h"
@@ skipping 65 matching lines @@
       item->tab_images[i].image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
       item->tab_images[i].image.allocPixels();
       item->tab_images[i].image.eraseARGB(255,
                                           i == 0 ? 255 : 0,
                                           i == 1 ? 255 : 0,
                                           i == 2 ? 255 : 0);
     }
     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
 
 namespace aura_shell {
 namespace examples {
 
 void InitWindowTypeLauncher();
 
 }  // namespace examples
@@ skipping 20 matching lines @@
   aura::RootWindow::GetInstance()->Run();
 
   aura_shell::Shell::DeleteInstance();
 
   aura::RootWindow::DeleteInstance();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }