Regression: task manager icon for chrome is blank...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 58 matching lines @@
 #if defined(OS_LINUX)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 // TODO(port): several win-only methods have been pulled out of this, but
 // BrowserMain() as a whole needs to be broken apart so that it's usable by
 // other platforms. For now, it's just a stub. This is a serious work in
 // progress and should not be taken as an indication of a real refactoring.
 
 #if defined(OS_WIN)
-
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "app/win_util.h"
 #include "base/registry.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/rlz/rlz.h"
+#include "chrome/browser/views/chrome_views_delegate.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_network_layer.h"
 #include "sandbox/src/sandbox.h"
 #include "views/widget/accelerator_handler.h"
-
 #endif  // defined(OS_WIN)
 
 #if defined(LINUX2)
 #include "chrome/browser/extensions/extension_protocols.h"
 #endif  // defined(LINUX2)
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/common/gtk_util.h"
 #endif
 
@@ skipping 255 matching lines @@
   // Initialize ResourceBundle which handles files loaded from external
   // sources. This has to be done before uninstall code path and before prefs
   // are registered.
   local_state->RegisterStringPref(prefs::kApplicationLocale, L"");
   local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
 
 #if defined(TOOLKIT_GTK)
   // It is important for this to happen before the first run dialog, as it
   // styles the dialog as well.
   gtk_util::InitRCStyles();
+#elif defined(TOOLKIT_VIEWS)
+  // The delegate needs to be set before any UI is created so that windows
+  // display the correct icon.
+  if (!views::ViewsDelegate::views_delegate)
+    views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
 #endif
 
+
 #if defined(OS_POSIX)
   // On Mac OS X / Linux we display the first run dialog as early as possible,
   // so we can get the stats enabled.
   // TODO(port):
   // We check the kNoFirstRun command line switch explicitly here since the
   // early placement of this block happens before that's factored into
   // first_run_ui_bypass, we probably want to move that block up
   // and remove the explicit check from here in the long run.
   if (is_first_run && !first_run_ui_bypass &&
       !parsed_command_line.HasSwitch(switches::kNoFirstRun)) {
@@ skipping 429 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }