chrome/test/browser_with_test_window_test.cc - Issue 6695029: Make ContentBrowserClient not be owned by ContentClient, so that the latter d...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/browser_with_test_window_test.cc

Issue 6695029: Make ContentBrowserClient not be owned by ContentClient, so that the latter d... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/test/browser_with_test_window_test.cc

===================================================================

--- chrome/test/browser_with_test_window_test.cc (revision 78112)

+++ chrome/test/browser_with_test_window_test.cc (working copy)

@@ -8,7 +8,6 @@

#include <ole2.h>

#endif // defined(OS_WIN)

-#include "chrome/browser/chrome_content_browser_client.h"

#include "chrome/browser/tabs/tab_strip_model.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_navigator.h"

@@ -37,8 +36,7 @@

// NOTE: I have a feeling we're going to want virtual methods for creating

// these, as such they're in SetUp instead of the constructor.

profile_.reset(new TestingProfile());

- content::GetContentClient()->set_browser_client(

- new chrome::ChromeContentBrowserClient());

+ content::GetContentClient()->set_browser_client(&browser_client_);

browser_.reset(new Browser(Browser::TYPE_NORMAL, profile()));

window_.reset(new TestBrowserWindow(browser()));

browser_->set_window(window_.get());

« chrome/common/chrome_content_client.cc ('K') | « chrome/test/browser_with_test_window_test.h ('k') | content/DEPS » ('j') | no next file with comments »