diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 06:00:28 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 06:00:28 +0000 |
| commit | c985ce973d819a4748dd1946f782a670980a70d3 (patch) | |
| tree | 85a0939a6a7d98be654eea1bb4709b21fb5b21ea /ui/base/win | |
| parent | 6ac0f3b7b49e4f7801d8be1af6adb33a3dc9977c (diff) | |
| download | chromium_src-c985ce973d819a4748dd1946f782a670980a70d3.zip chromium_src-c985ce973d819a4748dd1946f782a670980a70d3.tar.gz chromium_src-c985ce973d819a4748dd1946f782a670980a70d3.tar.bz2 | |
Remove some uses of ATL in UI code
Started by trying to remove only atlbase.h, but atlcrack.h (WTL)
uses CPoint/CSize, etc from ATL. So, msg_util.h is atlcrack.h,
but adapted to use gfx types, and with CR_ prefix on crack macros
for now.
R=ben@chromium.org
BUG=5027, 323300
Review URL: https://codereview.chromium.org/146833020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/win')
| -rw-r--r-- | ui/base/win/foreground_helper.cc | 8 | ||||
| -rw-r--r-- | ui/base/win/foreground_helper.h | 8 | ||||
| -rw-r--r-- | ui/base/win/hidden_window.cc | 6 |
3 files changed, 9 insertions, 13 deletions
diff --git a/ui/base/win/foreground_helper.cc b/ui/base/win/foreground_helper.cc index 219b26f..b4f53b6 100644 --- a/ui/base/win/foreground_helper.cc +++ b/ui/base/win/foreground_helper.cc @@ -72,13 +72,9 @@ HRESULT ForegroundHelper::ForegroundHotKey(HWND window) { return S_OK; } - // Handle the registered Hotkey being pressed. -LRESULT ForegroundHelper::OnHotKey(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled) { +// Handle the registered Hotkey being pressed. +void ForegroundHelper::OnHotKey(int id, UINT vcode, UINT modifiers) { SetForegroundWindow(window_); - return 1; } } // namespace ui diff --git a/ui/base/win/foreground_helper.h b/ui/base/win/foreground_helper.h index 73c9f63..8387c13 100644 --- a/ui/base/win/foreground_helper.h +++ b/ui/base/win/foreground_helper.h @@ -22,9 +22,9 @@ class UI_BASE_EXPORT ForegroundHelper : public gfx::WindowImpl { public: ForegroundHelper() : window_(NULL) { } - BEGIN_MSG_MAP_EX(ForegroundHelper) - MESSAGE_HANDLER(WM_HOTKEY, OnHotKey) - END_MSG_MAP() + CR_BEGIN_MSG_MAP_EX(ForegroundHelper) + CR_MSG_WM_HOTKEY(OnHotKey) + CR_END_MSG_MAP() // Brings a window into the foreground. // Can be called from any window, even if the caller is not the @@ -35,7 +35,7 @@ class UI_BASE_EXPORT ForegroundHelper : public gfx::WindowImpl { HRESULT ForegroundHotKey(HWND window); // Handle the registered Hotkey being pressed. - LRESULT OnHotKey(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); + void OnHotKey(int id, UINT vcode, UINT modifiers); HWND window_; diff --git a/ui/base/win/hidden_window.cc b/ui/base/win/hidden_window.cc index 3b21519..d04f2a3 100644 --- a/ui/base/win/hidden_window.cc +++ b/ui/base/win/hidden_window.cc @@ -42,9 +42,9 @@ class TempParent : public gfx::WindowImpl { void OnClose() { } - BEGIN_MSG_MAP_EX(WebContentsViewWin) - MSG_WM_CLOSE(OnClose) - END_MSG_MAP() + CR_BEGIN_MSG_MAP_EX(WebContentsViewWin) + CR_MSG_WM_CLOSE(OnClose) + CR_END_MSG_MAP() }; } // namespace |