Do not display "Google" in titlebar of Chromium builds.

- Create a new resource file that will contain Google Chrome specific resources. Ideally this new resource file should not be in the Chromium project at all but there doesnt seem to be any way to do conditional includes in vcproj files. So we ifdef its contents.
- Make distributor logo optional. If we do not find it, we do not try to paint/layout logo.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1158 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 5 deletions

diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc
index 3beccb4..09dbf19 100644
--- a/chrome/common/resource_bundle.cc
+++ b/chrome/common/resource_bundle.cc
@@ -195,13 +195,8 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
   // Handle the case where loading the bitmap failed.
   if (!bitmap) {
     LOG(WARNING) << "Unable to load bitmap with id " << resource_id;
-    NOTREACHED();  // Want to assert in debug mode.
     if (!empty_bitmap) {
-      // The placeholder bitmap is bright red so people notice the problem.
       empty_bitmap = new SkBitmap();
-      empty_bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
-      empty_bitmap->allocPixels();
-      empty_bitmap->eraseARGB(255, 255, 0, 0);
     }
     return empty_bitmap;
   }