Move window_resources.h to chrome/views to remove bad dependency of chrome/views on chrome/browser

http://crbug.com/2395

Review URL: http://codereview.chromium.org/7002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3076 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 4 insertions, 36 deletions

diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj
index 388f844..e8a17da 100644
--- a/chrome/browser/views/browser_views.vcproj
+++ b/chrome/browser/views/browser_views.vcproj
@@ -825,10 +825,6 @@
 			RelativePath=".\user_data_dir_dialog.h"
 			>
 		</File>
-		<File
-			RelativePath=".\window_resources.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index f50aef5..316bb6f 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/views/constrained_window_animation.h"
 #include "chrome/browser/views/location_bar_view.h"
-#include "chrome/browser/views/window_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/toolbar_model.h"
@@ -27,11 +26,12 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/client_view.h"
 #include "chrome/views/button.h"
+#include "chrome/views/client_view.h"
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/non_client_view.h"
+#include "chrome/views/window_resources.h"
 #include "net/base/net_util.h"
 
 #include "chromium_strings.h"
diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc
index 0ac6313..932be79 100644
--- a/chrome/browser/views/frame/aero_glass_non_client_view.cc
+++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc
@@ -7,13 +7,13 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/views/frame/browser_view2.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/browser/views/window_resources.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/client_view.h"
 #include "chrome/views/window_delegate.h"
+#include "chrome/views/window_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc
index 9630412..930fe61 100644
--- a/chrome/browser/views/frame/opaque_non_client_view.cc
+++ b/chrome/browser/views/frame/opaque_non_client_view.cc
@@ -7,12 +7,12 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/views/frame/browser_view2.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/browser/views/window_resources.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/root_view.h"
+#include "chrome/views/window_resources.h"
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
diff --git a/chrome/browser/views/window_resources.h b/chrome/browser/views/window_resources.h
deleted file mode 100644
index 30ffe65..0000000
--- a/chrome/browser/views/window_resources.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_
-#define CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_
-
-#include "SkBitmap.h"
-
-// TODO(beng): (http://crbug.com/2395) Move this file to chrome/views.
-
-typedef int FramePartBitmap;
-
-///////////////////////////////////////////////////////////////////////////////
-// WindowResources
-//
-//  An interface implemented by an object providing bitmaps to render the
-//  contents of a window frame. The Window may swap in different
-//  implementations of this interface to render different modes. The definition
-//  of FramePartBitmap depends on the implementation.
-//
-class WindowResources {
- public:
-  virtual ~WindowResources() { }
-  virtual SkBitmap* GetPartBitmap(FramePartBitmap part) const = 0;
-};
-
-#endif  // CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_