diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
| commit | 00ffe5dd99527a0cb1035af6749417f5fb1c134e (patch) | |
| tree | 4354d5b35be202204d9392417862b423ba374ce0 /views/widget | |
| parent | 65f73a3a996bdbaa167e38704df092aa39b53d3a (diff) | |
| download | chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.zip chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.gz chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.bz2 | |
Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!
TBR=sky
Review URL: http://codereview.chromium.org/113351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/root_view_drop_target.h | 4 | ||||
| -rw-r--r-- | views/widget/tooltip_manager.cc | 1 | ||||
| -rw-r--r-- | views/widget/widget_win.h | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/views/widget/root_view_drop_target.h b/views/widget/root_view_drop_target.h index 32cb14b..a3c3afd 100644 --- a/views/widget/root_view_drop_target.h +++ b/views/widget/root_view_drop_target.h @@ -5,6 +5,10 @@ #ifndef VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_ #define VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_ +#include <atlbase.h> +#include <atlapp.h> +#include <atlmisc.h> + #include "app/os_exchange_data.h" #include "base/base_drop_target.h" diff --git a/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc index c082040..59612e4 100644 --- a/views/widget/tooltip_manager.cc +++ b/views/widget/tooltip_manager.cc @@ -4,7 +4,6 @@ #include "views/widget/tooltip_manager.h" -#include <windowsx.h> #include <limits> #include "app/gfx/text_elider.h" diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index b39362f..d948e66 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -6,9 +6,7 @@ #define VIEWS_WIDGET_WIDGET_WIN_H_ #include <atlbase.h> -#include <atlapp.h> #include <atlcrack.h> -#include <atlmisc.h> #include "base/message_loop.h" #include "base/system_monitor.h" @@ -38,7 +36,7 @@ RootView* GetRootViewForHWND(HWND hwnd); // uMsg - kReflectedMessage // wParam - Should be 0 // lParam - Pointer to MSG struct containing the original message. -const int kReflectedMessage = WM_APP + 3; +static const int kReflectedMessage = WM_APP + 3; // These two messages aren't defined in winuser.h, but they are sent to windows // with captions. They appear to paint the window caption and frame. @@ -48,8 +46,8 @@ const int kReflectedMessage = WM_APP + 3; // window and paint the standard caption/title over the top of the custom one. // So we need to handle these messages in CustomFrameWindow to prevent this // from happening. -const int WM_NCUAHDRAWCAPTION = 0xAE; -const int WM_NCUAHDRAWFRAME = 0xAF; +static const int WM_NCUAHDRAWCAPTION = 0xAE; +static const int WM_NCUAHDRAWFRAME = 0xAF; /////////////////////////////////////////////////////////////////////////////// // |