diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 19:13:22 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 19:13:22 +0000 |
| commit | 4d550fa470364c570b143aad57213a2bc63ee3e8 (patch) | |
| tree | 04cda02a17928ffcdc26a307bc308eb9cd8801d7 /chrome/utility | |
| parent | d816516f626be0f140116c609d40accb3cb54af1 (diff) | |
| download | chromium_src-4d550fa470364c570b143aad57213a2bc63ee3e8.zip chromium_src-4d550fa470364c570b143aad57213a2bc63ee3e8.tar.gz chromium_src-4d550fa470364c570b143aad57213a2bc63ee3e8.tar.bz2 | |
Make chrome/utility not depend on content/common. Enforce with DEPS.
BUG=98716
Review URL: http://codereview.chromium.org/8351028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/DEPS | 2 | ||||
| -rw-r--r-- | chrome/utility/chrome_content_utility_client.cc | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/chrome/utility/DEPS b/chrome/utility/DEPS index 87d7ba5..4893780 100644 --- a/chrome/utility/DEPS +++ b/chrome/utility/DEPS @@ -1,5 +1,7 @@ include_rules = [ "+chrome/browser", # For out of process profile import. + # TODO(jam): remove this once all of chrome doesn't depend on content/common. + "-content/common", "+content/public/utility", "+webkit/glue", ] diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index d10bfb1..497ba56 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -31,8 +31,6 @@ #include "base/path_service.h" #include "base/win/iat_patch_function.h" #include "base/win/scoped_handle.h" -#include "content/common/child_process_messages.h" -#include "content/common/sandbox_init_wrapper.h" #include "content/public/common/content_switches.h" #include "printing/emf_win.h" #endif // defined(OS_WIN) @@ -234,12 +232,9 @@ DWORD WINAPI UtilityProcess_GetFontDataPatch( LOGFONT logfont; if (GetObject(font, sizeof(LOGFONT), &logfont)) { std::vector<char> font_data; - if (content::UtilityThread::Get()->Send( - new ChildProcessHostMsg_PreCacheFont(logfont))) { - rv = GetFontData(hdc, table, offset, buffer, length); - content::UtilityThread::Get()->Send( - new ChildProcessHostMsg_ReleaseCachedFonts()); - } + content::UtilityThread::Get()->PreCacheFont(logfont); + rv = GetFontData(hdc, table, offset, buffer, length); + content::UtilityThread::Get()->ReleaseCachedFonts(); } } return rv; |