diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 03:56:53 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 03:56:53 +0000 |
| commit | 7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff (patch) | |
| tree | 0a0917e11f12a7e607eac702edd5eef574edc360 /media/player/player_wtl.cc | |
| parent | 51046488738f8a3fdd7f55fc046a93f89e0294f7 (diff) | |
| download | chromium_src-7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff.zip chromium_src-7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff.tar.gz chromium_src-7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff.tar.bz2 | |
Revert r15615, build errors on linux and mac.
Review URL: http://codereview.chromium.org/113135
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/player/player_wtl.cc')
| -rw-r--r-- | media/player/player_wtl.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/media/player/player_wtl.cc b/media/player/player_wtl.cc index 26cbaba..0c2bb6b 100644 --- a/media/player/player_wtl.cc +++ b/media/player/player_wtl.cc @@ -14,14 +14,14 @@ // Note this header must come before other ATL headers. #include "media/player/stdafx.h" -#include <atlcrack.h> // NOLINT -#include <atlctrls.h> // NOLINT -#include <atlctrlw.h> // NOLINT -#include <atldlgs.h> // NOLINT -#include <atlframe.h> // NOLINT -#include <atlmisc.h> // NOLINT -#include <atlprint.h> // NOLINT -#include <atlscrl.h> // NOLINT +#include <atlcrack.h> +#include <atlctrls.h> +#include <atlctrlw.h> +#include <atldlgs.h> +#include <atlframe.h> +#include <atlmisc.h> +#include <atlprint.h> +#include <atlscrl.h> // Note these headers are order sensitive. #include "base/at_exit.h" @@ -45,7 +45,6 @@ CAppModule g_module; int Run(wchar_t* cmd_line, int cmd_show) { - base::AtExitManager exit_manager; CMessageLoop the_loop; g_module.AddMessageLoop(&the_loop); @@ -57,6 +56,7 @@ int Run(wchar_t* cmd_line, int cmd_show) { wnd_main.ShowWindow(cmd_show); + base::AtExitManager exit_manager; wchar_t* url = NULL; if (cmd_line && *cmd_line) { |