Move ImageWindowDelegate to ui/aura_extra

ui/aura_extra/image_window_delegate.cc

 // Copyright (c) 2013 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 "content/browser/web_contents/aura/image_window_delegate.h"
+#include "ui/aura_extra/image_window_delegate.h"
 
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
-namespace content {
+namespace aura_extra {
 
 ImageWindowDelegate::ImageWindowDelegate()
-    : size_mismatch_(false) {
+    : background_color_(SK_ColorWHITE),
+      size_mismatch_(false) {
 }
 
 ImageWindowDelegate::~ImageWindowDelegate() {
 }
 
 void ImageWindowDelegate::SetImage(const gfx::Image& image) {
   image_ = image;
   if (!window_size_.IsEmpty() && !image_.IsEmpty())
     size_mismatch_ = window_size_ != image_.AsImageSkia().size();
 }
@@ skipping 28 matching lines @@
 }
 
 bool ImageWindowDelegate::CanFocus() {
   return false;
 }
 
 void ImageWindowDelegate::OnCaptureLost() {
 }
 
 void ImageWindowDelegate::OnPaint(gfx::Canvas* canvas) {
-  if (image_.IsEmpty()) {
-    canvas->DrawColor(SK_ColorWHITE);
-  } else {
-    if (size_mismatch_)
-      canvas->DrawColor(SK_ColorWHITE);
-    canvas->DrawImageInt(image_.AsImageSkia(), 0, 0);
+  if (background_color_ != SK_ColorTRANSPARENT &&
+      (image_.IsEmpty() || size_mismatch_ || !offset_.IsZero())) {
+    canvas->DrawColor(background_color_);
   }
+  if (!image_.IsEmpty())
+    canvas->DrawImageInt(image_.AsImageSkia(), offset_.x(), offset_.y());
 }
 
 void ImageWindowDelegate::OnDeviceScaleFactorChanged(float scale_factor) {
 }
 
 void ImageWindowDelegate::OnWindowDestroying(aura::Window* window) {
 }
 
 void ImageWindowDelegate::OnWindowDestroyed(aura::Window* window) {
   delete this;
 }
 
 void ImageWindowDelegate::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool ImageWindowDelegate::HasHitTestMask() const {
   return false;
 }
 
 void ImageWindowDelegate::GetHitTestMask(gfx::Path* mask) const {
 }
 
-}  // namespace content
+}  // namespace aura_extra