diff options
Diffstat (limited to 'chrome_frame/ready_mode/internal')
| -rw-r--r-- | chrome_frame/ready_mode/internal/ready_prompt_window.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/chrome_frame/ready_mode/internal/ready_prompt_window.cc b/chrome_frame/ready_mode/internal/ready_prompt_window.cc index ddb51a9..2c1e3e5 100644 --- a/chrome_frame/ready_mode/internal/ready_prompt_window.cc +++ b/chrome_frame/ready_mode/internal/ready_prompt_window.cc @@ -5,16 +5,7 @@ #include "chrome_frame/ready_mode/internal/ready_prompt_window.h" #include <atlctrls.h> -#include <Shellapi.h> // Must appear before atlctrlx.h - -// These seem to be required by atlctrlx? -template<class A> -A min(A const& a, A const& b) { return a < b ? a : b; } - -template<class A> -A max(A const& a, A const& b) { return a > b ? a : b; } - -#include <atlctrlx.h> +#include <Shellapi.h> #include "base/compiler_specific.h" #include "base/win/scoped_bstr.h" @@ -24,6 +15,13 @@ A max(A const& a, A const& b) { return a > b ? a : b; } #include "chrome_frame/simple_resource_loader.h" #include "grit/chromium_strings.h" +// atlctrlx.h requires 'min' and 'max' macros, the definition of which conflicts +// with STL headers. Hence we include them out of the order defined by style +// guidelines. As a result you may not refer to std::min or std::max in this +// file. +#include <minmax.h> // NOLINT +#include <atlctrlx.h> // NOLINT + ReadyPromptWindow::ReadyPromptWindow( InfobarContent::Frame* frame, ReadyModeState* ready_mode_state, UrlLauncher* url_launcher) |