diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 03:36:44 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 03:36:44 +0000 |
| commit | ee9653f9a6db545c361da48b856aa601a04005b3 (patch) | |
| tree | 792aba47d663cb39d07c14c30f1b7ee90a51f742 /chrome/browser/views/constrained_window_impl.cc | |
| parent | c919469b3dfc6ea110fdc2218c014599babfd6e9 (diff) | |
| download | chromium_src-ee9653f9a6db545c361da48b856aa601a04005b3.zip chromium_src-ee9653f9a6db545c361da48b856aa601a04005b3.tar.gz chromium_src-ee9653f9a6db545c361da48b856aa601a04005b3.tar.bz2 | |
Fix the polymorphic WindowResources class and FramePartBitmap enum.
TBR=ben
Review URL: http://codereview.chromium.org/224
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/constrained_window_impl.cc')
| -rw-r--r-- | chrome/browser/views/constrained_window_impl.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 3d0b0c3..85d9e58 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -10,6 +10,7 @@ #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" @@ -40,11 +41,8 @@ namespace ChromeViews { class ClientView; } -//////////////////////////////////////////////////////////////////////////////// -// WindowResources - // An enumeration of bitmap resources used by this window. -enum FramePartBitmap { +enum { FRAME_PART_BITMAP_FIRST = 0, // Must be first. FRAME_BOTTOM_CENTER, @@ -82,14 +80,6 @@ static const int kOTRFramePartIDs[] = { IDR_WINDOW_TOP_LEFT_CORNER_OTR, IDR_WINDOW_TOP_RIGHT_CORNER_OTR, IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, 0 }; -class WindowResources { - public: - virtual ~WindowResources() {} - virtual SkBitmap* GetPartBitmap(FramePartBitmap part_id) const = 0; - virtual const ChromeFont& GetTitleFont() const = 0; - virtual SkColor GetTitleColor() const = 0; -}; - class XPWindowResources : public WindowResources { public: XPWindowResources() { |