services/navigation/content_client/browser_main_parts.cc - Issue 1986003002: Revert of Add a basic browser to mash that uses the navigation service.

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: services/navigation/content_client/browser_main_parts.cc

Issue 1986003002: Revert of Add a basic browser to mash that uses the navigation service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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: services/navigation/content_client/browser_main_parts.cc

diff --git a/services/navigation/content_client/browser_main_parts.cc b/services/navigation/content_client/browser_main_parts.cc

index 09a688b3c999058a00bfea49d2c5f9e1e34ea4bb..1db9464344d8fa63b24132fa035f204cf5dd11bc 100644

--- a/services/navigation/content_client/browser_main_parts.cc

+++ b/services/navigation/content_client/browser_main_parts.cc

@@ -5,7 +5,6 @@

#include "services/navigation/content_client/browser_main_parts.h"

#include "base/message_loop/message_loop.h"

-#include "content/public/common/mojo_shell_connection.h"

#include "content/shell/browser/shell_browser_context.h"

#include "content/shell/browser/shell_net_log.h"

#include "services/navigation/navigation.h"

@@ -26,8 +25,7 @@

net_log_.reset(new content::ShellNetLog("ash_shell"));

browser_context_.reset(

new content::ShellBrowserContext(false, net_log_.get()));

- navigation_->Init(content::MojoShellConnection::Get()->GetConnector(),

- browser_context());

+ navigation_->SetBrowserContext(browser_context());

}

void BrowserMainParts::PostMainMessageLoopRun() {

« no previous file with comments | « services/navigation/DEPS ('k') | services/navigation/content_client/main_delegate.cc » ('j') | no next file with comments »