Replace one unfortunate hack with a somewhat better one. The included atlctrl...

chrome_frame/ready_mode/internal/ready_prompt_window.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/win/scoped_comptr.h"
 #include "chrome_frame/ready_mode/internal/ready_mode_state.h"
 #include "chrome_frame/ready_mode/internal/url_launcher.h"
 #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)
     : frame_(frame),
       ready_mode_state_(ready_mode_state),
       url_launcher_(url_launcher),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 ReadyPromptWindow::~ReadyPromptWindow() {
 }
@@ skipping 66 matching lines @@
                                        LPNMHDR /*lParam*/,
                                        BOOL& /*bHandled*/) {
   url_launcher_->LaunchUrl(SimpleResourceLoader::Get(
       IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL));
   return 0;
 }
 
 void ReadyPromptWindow::OnFinalMessage(HWND) {
   delete this;
 }