diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 00:39:21 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 00:39:21 +0000 |
| commit | d916973bccd05b1e7cc1a240ac02b81beb6c37bb (patch) | |
| tree | 8ff74477217c26d43ce01e4682690a27146735f0 | |
| parent | 54d350d0b24af8d1596a0f848a26fc51a60517a7 (diff) | |
| download | chromium_src-d916973bccd05b1e7cc1a240ac02b81beb6c37bb.zip chromium_src-d916973bccd05b1e7cc1a240ac02b81beb6c37bb.tar.gz chromium_src-d916973bccd05b1e7cc1a240ac02b81beb6c37bb.tar.bz2 | |
Modify #include order slightly to clearly put ATL headers first.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6676120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79353 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc | 11 | ||||
| -rw-r--r-- | chrome/default_plugin/plugin_database_handler.cc | 8 | ||||
| -rw-r--r-- | views/controls/table/table_view_unittest.cc | 7 |
3 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc index 43d29e0..4ac6e3e 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h" - -// Intentional header placing, including ATL, to avoid errors -#include "build/build_config.h" // NOLINT - +// For WinDDK ATL compatibility, these ATL headers must come first. +#include "build/build_config.h" #if defined(OS_WIN) #include <atlbase.h> // NOLINT #include <atlwin.h> // NOLINT #endif +#include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h" + +#include <algorithm> // NOLINT + #include "base/i18n/bidi_line_iterator.h" #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view_model.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" diff --git a/chrome/default_plugin/plugin_database_handler.cc b/chrome/default_plugin/plugin_database_handler.cc index 227bd66..d2659319 100644 --- a/chrome/default_plugin/plugin_database_handler.cc +++ b/chrome/default_plugin/plugin_database_handler.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/default_plugin/plugin_database_handler.h" - -// The placing of the ATL headers is intentional to avoid errors +// For WinDDK ATL compatibility, these ATL headers must come first. #include <atlbase.h> #include <atlwin.h> +#include "chrome/default_plugin/plugin_database_handler.h" + #include "libxml/parser.h" #include "libxml/xpath.h" diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc index c075054..c34fe79 100644 --- a/views/controls/table/table_view_unittest.cc +++ b/views/controls/table/table_view_unittest.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -// Intentional header placing, including ATL, to avoid errors -#include "build/build_config.h" // NOLINT - +// For WinDDK ATL compatibility, these ATL headers must come first. +#include "build/build_config.h" #if defined(OS_WIN) #include <atlbase.h> // NOLINT #include <atlwin.h> // NOLINT |