diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 00:38:07 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 00:38:07 +0000 |
| commit | dd23da5ef153e6e25ce5beb0a5e31b8897a6c798 (patch) | |
| tree | e40c98448168247167e3bf6daa1093c7c5c4173b /webkit | |
| parent | e189ded610a96be121eeca509c62e7bdf9e9c1b4 (diff) | |
| download | chromium_src-dd23da5ef153e6e25ce5beb0a5e31b8897a6c798.zip chromium_src-dd23da5ef153e6e25ce5beb0a5e31b8897a6c798.tar.gz chromium_src-dd23da5ef153e6e25ce5beb0a5e31b8897a6c798.tar.bz2 | |
Minor cleanup.
R=ojan
Review URL: http://codereview.chromium.org/13768
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 7 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.cc | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index d6ec632a2f..e9d5cca 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -36,9 +36,7 @@ #include "base/compiler_specific.h" MSVC_PUSH_WARNING_LEVEL(0); #include "CSSStyleSelector.h" -#if defined(OS_WIN) #include "Cursor.h" -#endif #include "Document.h" #include "DocumentLoader.h" #include "DragController.h" @@ -61,10 +59,12 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "MIMETypeRegistry.h" #include "NodeRenderStyle.h" #include "Page.h" +#include "PlatformContextSkia.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" #include "PlatformWheelEvent.h" #include "PluginInfoStore.h" +#include "PopupMenuChromium.h" #include "PopupMenuClient.h" #if defined(OS_WIN) #include "RenderThemeWin.h" @@ -74,7 +74,6 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "SelectionController.h" #include "Settings.h" #include "TypingCommand.h" -#include "event_conversion.h" MSVC_POP_WARNING(); #undef LOG @@ -101,8 +100,6 @@ MSVC_POP_WARNING(); #include "webkit/glue/webview_delegate.h" #include "webkit/glue/webview_impl.h" #include "webkit/glue/webwidget_impl.h" -#include "webkit/port/platform/chromium/PopupMenuChromium.h" -#include "webkit/port/platform/graphics/skia/PlatformContextSkia.h" // Get rid of WTF's pow define so we can use std::pow. #undef pow diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc index 97287b2..dfd86d9 100644 --- a/webkit/glue/webwidget_impl.cc +++ b/webkit/glue/webwidget_impl.cc @@ -238,7 +238,7 @@ WebCore::IntRect WebWidgetImpl::windowToScreen( PlatformWidget WebWidgetImpl::platformWindow() const { if (!delegate_) - return NULL; + return NULL; return delegate_->GetContainingWindow(const_cast<WebWidgetImpl*>(this)); } |