views: Packaged app window icon should be system/generic icon, if icon is not set by default.

chrome/browser/ui/views/extensions/shell_window_views.cc

Index: chrome/browser/ui/views/extensions/shell_window_views.cc
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc
index 63c30a5bd05a2eeda192f9ccdf04b675aed2a450..08a1eb8309c15b775581eb97447a834fe6142664 100644
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc
@@ -28,6 +28,7 @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
@@ -325,7 +326,17 @@ ShellWindowViews::ShellWindowViews(ShellWindow* shell_window,
   params.remove_standard_frame = true;
   minimum_size_ = win_params.minimum_size;
   maximum_size_ = win_params.maximum_size;
+
+  // Set the views::ViewsDelegate::views_delegate to NULL
+  // when initialize widget for shell window,
+  // which would remove chrome specific setting for widget,
+  // such as default icon.
+  views::ViewsDelegate* original_delegate =

[sky, 2012/09/21 16:15:51]

This feels like a hack and is likely to be problematic in the future. What is
the ChromeViewsDelegate doing that we don't want done here? Can we push some
state into the widget/window so ViewsDelegate doesn't attempt to do whatever it
is doing now that is causing problems?

+      views::ViewsDelegate::views_delegate;
+  views::ViewsDelegate::views_delegate = NULL;
   window_->Init(params);
+  views::ViewsDelegate::views_delegate = original_delegate;
+
   gfx::Rect window_bounds =
       window_->non_client_view()->GetWindowBoundsForClientBounds(
           win_params.bounds);