diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 00:57:29 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 00:57:29 +0000 |
| commit | 50e52cdb7b513558163b1d0285b4755dc697cd40 (patch) | |
| tree | 2f72657bdeef16fff04e289798474ee8ae124774 /chrome/app | |
| parent | 823821512bc23506c8d8b90651cfebe72d314d20 (diff) | |
| download | chromium_src-50e52cdb7b513558163b1d0285b4755dc697cd40.zip chromium_src-50e52cdb7b513558163b1d0285b4755dc697cd40.tar.gz chromium_src-50e52cdb7b513558163b1d0285b4755dc697cd40.tar.bz2 | |
Add a ContentClient interface than an embedder of content has to implement. This allows us to move Chrome specific code out of content.
Review URL: http://codereview.chromium.org/6660011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 481941f..0156d2a 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -25,6 +25,7 @@ #include "chrome/browser/diagnostics/diagnostics_main.h" #include "chrome/browser/platform_util.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" @@ -37,6 +38,7 @@ #include "chrome/common/set_process_title.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/common/content_client.h" #include "content/common/content_paths.h" #include "ipc/ipc_switches.h" #include "ui/base/resource/resource_bundle.h" @@ -574,6 +576,10 @@ int ChromeMain(int argc, char** argv) { Append(chrome::kHelperProcessExecutablePath)); #endif + // Initialize the content client which that code uses to talk to Chrome. + chrome::ChromeContentClient chrome_content_client; + content::SetContentClient(&chrome_content_client); + // Notice a user data directory override if any FilePath user_data_dir = command_line.GetSwitchValuePath(switches::kUserDataDir); |