Commit 2e13fbc2 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Undefine Win32 macros IsMinimized, IsRestored, IsMaximized

Names used in the BaseWindow class are also windows.h macros.
That the names are the same as in the Windows API is
no coincidence but for now we don't want the Windows macros
to interfere so we undef them.

There are already undefs in widgets.h but depending on the order
of includes they might not be effective.

Bug: 773275
Change-Id: I2be80c8a3f64f4741163def9c27e386c95753a40
Reviewed-on: https://chromium-review.googlesource.com/845582Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#526694}
parent 9234e9ce
......@@ -6,9 +6,19 @@
#define UI_BASE_BASE_WINDOW_H_
#include "base/compiler_specific.h"
#include "build/build_config.h"
#include "ui/base/ui_base_types.h" // WindowShowState
#include "ui/gfx/native_widget_types.h"
#if defined(OS_WIN)
// Names used in this class are also windows.h macros. That the names
// are the same as in the Windows API is no coincidence but for now we
// don't want the Windows macros to interfere so we undef them.
#undef IsMinimized
#undef IsMaximized
#undef IsRestored
#endif // OS_WIN
namespace gfx {
class Rect;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment