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

 // Copyright (c) 2012 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 "chrome/browser/ui/views/extensions/shell_window_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 10 matching lines @@
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/views/controls/button/button.h"
 #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"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "ui/base/win/shell.h"
 #endif
 
 #if defined(USE_ASH)
@@ skipping 277 matching lines @@
     : shell_window_(shell_window),
       web_view_(NULL),
       is_fullscreen_(false),
       frameless_(win_params.frame == ShellWindow::CreateParams::FRAME_NONE) {
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;
   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);
   window_->SetBounds(window_bounds);
   // Center window if no position was specified.
   if (win_params.bounds.x() < 0 || win_params.bounds.y() < 0)
     window_->CenterWindow(window_bounds.size());
 #if defined(OS_WIN) && !defined(USE_AURA)
   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
       extension()->id());
@@ skipping 312 matching lines @@
                                            ui::WindowShowState show_state) {
   views::WidgetDelegate::SaveWindowPlacement(bounds, show_state);
   shell_window_->SaveWindowPosition();
 }
 
 // static
 NativeShellWindow* NativeShellWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new ShellWindowViews(shell_window, params);
 }