summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 20:27:35 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 20:27:35 +0000
commitda13e896a39a8fa7adeb7ea0c3345f62fbcbac86 (patch)
treedae375b63afd1a52c6a5449d62b2d1882b50fe7f /chrome/browser
parentf242f222bbba36f1df1392ddf0717c4a584c286f (diff)
downloadchromium_src-da13e896a39a8fa7adeb7ea0c3345f62fbcbac86.zip
chromium_src-da13e896a39a8fa7adeb7ea0c3345f62fbcbac86.tar.gz
chromium_src-da13e896a39a8fa7adeb7ea0c3345f62fbcbac86.tar.bz2
Make ContentBrowserClient not be owned by ContentClient, so that the latter doesn't have to include a header from the former. Also tighten up DEPS checking so that we ensure that content\common doesn't depend on any other content directory.
Review URL: http://codereview.chromium.org/6695029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 59522f0..ac58f16 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1477,8 +1477,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
// Override the default ContentBrowserClient to let Chrome participate in
// content logic. Must be done before any tabs are created.
- content::GetContentClient()->set_browser_client(
- new chrome::ChromeContentBrowserClient());
+ chrome::ChromeContentBrowserClient browser_client;
+ content::GetContentClient()->set_browser_client(&browser_client);
// Tests should be able to tune login manager before showing it.
// Thus only show login manager in normal (non-testing) mode.