diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 02:48:27 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 02:48:27 +0000 |
| commit | 4bcac78e6c353cd9823f559dc8c6181e824e88ce (patch) | |
| tree | e14c602e6c08c3d817f4684604b4f35b17c7a27d /chrome/browser/profile.cc | |
| parent | 4dfabc88767a14cb40b7b96ac1e1f1912f03391c (diff) | |
| download | chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.zip chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.tar.gz chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.tar.bz2 | |
Revert basically everything I've done today as it fails mysteriously
and I lack the patience to diagnose why mac doesn't link in libjpeg.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index e640895..158a9e1 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/history/history.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -42,6 +41,7 @@ #if defined(OS_WIN) #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/download/download_manager.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/search_engines/template_url_fetcher.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/tab_restore_service.h" |