Add tests for panel app icon functionaility.

chrome/browser/ui/views/panels/panel_view.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/panels/panel_view.h"
 
 #include <map>
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/windows_version.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/views/panels/panel_frame_view.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA)
-#include "ui/base/win/shell.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/panels/taskbar_window_thumbnailer_win.h"
+#include "ui/base/win/shell.h"
+#include "ui/gfx/icon_util.h"
 #endif
 
 namespace {
 
 // Supported accelerators.
 // Note: We can't use the acclerator table defined in chrome/browser/ui/views
 // due to checkdeps violation.
 struct AcceleratorMapping {
   ui::KeyboardCode keycode;
   int modifiers;
@@ skipping 42 matching lines @@
  private:
   virtual void PressLeftMouseButtonTitlebar(
       const gfx::Point& mouse_location, panel::ClickModifier modifier) OVERRIDE;
   virtual void ReleaseMouseButtonTitlebar(
       panel::ClickModifier modifier) OVERRIDE;
   virtual void DragTitlebar(const gfx::Point& mouse_location) OVERRIDE;
   virtual void CancelDragTitlebar() OVERRIDE;
   virtual void FinishDragTitlebar() OVERRIDE;
   virtual bool VerifyDrawingAttention() const OVERRIDE;
   virtual bool VerifyActiveState(bool is_active) OVERRIDE;
+  virtual bool VerifyAppIcon() const OVERRIDE;
   virtual bool IsWindowSizeKnown() const OVERRIDE;
   virtual bool IsAnimatingBounds() const OVERRIDE;
   virtual bool IsButtonVisible(
       panel::TitlebarButtonType button_type) const OVERRIDE;
 
   PanelView* panel_view_;
 };
 
 NativePanelTestingWin::NativePanelTestingWin(PanelView* panel_view)
     : panel_view_(panel_view) {
@@ skipping 25 matching lines @@
   return panel_view_->GetFrameView()->paint_state() ==
          PanelFrameView::PAINT_FOR_ATTENTION;
 }
 
 bool NativePanelTestingWin::VerifyActiveState(bool is_active) {
   return panel_view_->GetFrameView()->paint_state() ==
          (is_active ? PanelFrameView::PAINT_AS_ACTIVE
                     : PanelFrameView::PAINT_AS_INACTIVE);
 }
 
+bool NativePanelTestingWin::VerifyAppIcon() const {
+#if defined(OS_WIN) && !defined(USE_AURA)

[jennb, 2012/10/02 17:51:08]

Should this be USE_ASH?  Aura is the hw accelerated UI framework.

[jianli, 2012/10/02 21:37:26]

This should be USE_AURA since there could be a build with USE_AURA defined but
not with USE_ASH (like win_aura bot). We only want the verification code work
for standalone Windows build.

+  // We only care about Windows 7 and later.
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
+    return true;
+
+  HWND native_window = panel_view_->GetNativePanelHandle();
+  HICON app_icon = reinterpret_cast<HICON>(
+      ::SendMessage(native_window, WM_GETICON, ICON_BIG, 0L));
+  if (!app_icon)
+    return false;
+  scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(app_icon));
+  return bitmap.get() && bitmap->width() == 32 && bitmap->height() == 32;
+#else
+  return true;
+#endif
+}
+
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_view_->IsAnimatingBounds();
 }
 
 bool NativePanelTestingWin::IsButtonVisible(
     panel::TitlebarButtonType button_type) const {
@@ skipping 635 matching lines @@
   int height = web_view_->size().height();
   SkRegion* region = new SkRegion;
   region->op(0, 0, kResizeInsideBoundsSize, height, SkRegion::kUnion_Op);
   region->op(width - kResizeInsideBoundsSize, 0, width, height,
       SkRegion::kUnion_Op);
   region->op(0, height - kResizeInsideBoundsSize, width, height,
       SkRegion::kUnion_Op);
   web_contents->GetRenderViewHost()->GetView()->SetClickthroughRegion(region);
 #endif
 }