diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 22:34:43 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 22:34:43 +0000 |
| commit | 885918b05a97c69e13e3c604e3ae7ab3a4b829ff (patch) | |
| tree | d20009fb426c9b499f3e058a817f30630b4a89bf /webkit | |
| parent | 95d1d6ad977968888f027e855bd9918ec27443a7 (diff) | |
| download | chromium_src-885918b05a97c69e13e3c604e3ae7ab3a4b829ff.zip chromium_src-885918b05a97c69e13e3c604e3ae7ab3a4b829ff.tar.gz chromium_src-885918b05a97c69e13e3c604e3ae7ab3a4b829ff.tar.bz2 | |
Move ThemeData into RenderThemeWin.h to match what happened upstream.
R=ojan
Review URL: http://codereview.chromium.org/10006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/port/port.vcproj | 16 | ||||
| -rw-r--r-- | webkit/port/platform/ThemeData.h | 17 | ||||
| -rw-r--r-- | webkit/port/rendering/RenderThemeWin.h | 11 |
3 files changed, 15 insertions, 29 deletions
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index e2d6a31..395eb0e 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -672,10 +672,6 @@ > </File> <File - RelativePath="..\..\port\platform\ThemeData.h" - > - </File> - <File RelativePath="..\..\port\platform\UniscribeStateTextRun.cpp" > </File> @@ -711,27 +707,27 @@ > </File> <File - RelativePath="..\..\port\platform\chromium\ContextMenuChromium.cpp" + RelativePath="..\..\port\platform\chromium\ChromiumDataObject.cpp" > </File> <File - RelativePath="..\..\port\platform\chromium\ContextMenuItemChromium.cpp" + RelativePath="..\..\port\platform\chromium\ChromiumDataObject.h" > </File> <File - RelativePath="..\..\port\platform\chromium\ChromiumDataObject.cpp" + RelativePath="..\..\port\platform\chromium\ClipboardChromium.cpp" > </File> <File - RelativePath="..\..\port\platform\chromium\ChromiumDataObject.h" + RelativePath="..\..\port\platform\chromium\ClipboardChromium.h" > </File> <File - RelativePath="..\..\port\platform\chromium\ClipboardChromium.cpp" + RelativePath="..\..\port\platform\chromium\ContextMenuChromium.cpp" > </File> <File - RelativePath="..\..\port\platform\chromium\ClipboardChromium.h" + RelativePath="..\..\port\platform\chromium\ContextMenuItemChromium.cpp" > </File> <File diff --git a/webkit/port/platform/ThemeData.h b/webkit/port/platform/ThemeData.h deleted file mode 100644 index 0c9431f..0000000 --- a/webkit/port/platform/ThemeData.h +++ /dev/null @@ -1,17 +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 ThemeData_h -#define ThemeData_h - -struct ThemeData { - ThemeData() : m_part(0), m_state(0), m_classicState(0) {} - - unsigned m_part; - unsigned m_state; - unsigned m_classicState; -}; - -#endif // ThemeData_h - diff --git a/webkit/port/rendering/RenderThemeWin.h b/webkit/port/rendering/RenderThemeWin.h index a862eab..0c50ee8 100644 --- a/webkit/port/rendering/RenderThemeWin.h +++ b/webkit/port/rendering/RenderThemeWin.h @@ -24,7 +24,6 @@ #define RenderThemeWin_h #include "RenderTheme.h" -#include "ThemeData.h" #if WIN32 typedef void* HANDLE; @@ -34,6 +33,14 @@ typedef HINSTANCE HMODULE; namespace WebCore { +struct ThemeData { + ThemeData() : m_part(0), m_state(0), m_classicState(0) {} + + unsigned m_part; + unsigned m_state; + unsigned m_classicState; +}; + class RenderThemeWin : public RenderTheme { public: RenderThemeWin(); @@ -128,6 +135,6 @@ private: int menuListInternalPadding(RenderStyle* style, int paddingType) const; }; -}; +} #endif |