diff options
| author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 03:08:45 +0000 |
|---|---|---|
| committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 03:08:45 +0000 |
| commit | 2aba747f04b9466ec85ff659285192da21195c32 (patch) | |
| tree | a5cc48ab501d0f6bb21ffb0d02815e858c3d9fdc | |
| parent | 6bf0d1f5117125b0aa9d94c7635d18963fde626f (diff) | |
| download | chromium_src-2aba747f04b9466ec85ff659285192da21195c32.zip chromium_src-2aba747f04b9466ec85ff659285192da21195c32.tar.gz chromium_src-2aba747f04b9466ec85ff659285192da21195c32.tar.bz2 | |
Revert 78660 - We need to revert both jam's first patch and his build fix, as it didn't fix everything.
Revert 78645 - Fix build break
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/6714007
TBR=ericu@google.com
Review URL: http://codereview.chromium.org/6709020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78661 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/chrome_main_posix.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_posix.cc b/chrome/app/chrome_main_posix.cc index 4ba1437..810c5c8 100644 --- a/chrome/app/chrome_main_posix.cc +++ b/chrome/app/chrome_main_posix.cc @@ -9,7 +9,7 @@ #include "base/global_descriptors_posix.h" #include "base/logging.h" #include "base/process_util.h" -#include "chrome/common/chrome_descriptors.h" +#include "content/common/chrome_descriptors.h" #if defined(OS_MACOSX) #include "chrome/app/breakpad_mac.h" |