ash/shell/content_client/shell_browser_main_parts.cc - Issue 277753002: Makes construction of (ash)RemoteWindowTreeHostWin explicit

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: ash/shell/content_client/shell_browser_main_parts.cc

Issue 277753002: Makes construction of (ash)RemoteWindowTreeHostWin explicit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 6 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:

Index: ash/shell/content_client/shell_browser_main_parts.cc

diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc

index 72239208a1e1beee0026ed81e1e0c44de14a6b47..8c2a37a3e3f75056727a3d9e613fe8cabcead959 100644

--- a/ash/shell/content_client/shell_browser_main_parts.cc

+++ b/ash/shell/content_client/shell_browser_main_parts.cc

@@ -9,6 +9,7 @@

#include "ash/shell.h"

#include "ash/shell/shell_delegate_impl.h"

#include "ash/shell/window_watcher.h"

+#include "ash/shell_init_params.h"

#include "ash/system/user/login_status.h"

#include "base/bind.h"

#include "base/command_line.h"

@@ -121,7 +122,9 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {

chromeos::CrasAudioHandler::InitializeForTesting();

#endif

- ash::Shell::CreateInstance(delegate_);

+ ash::ShellInitParams init_params;

+ init_params.delegate = delegate_;

+ ash::Shell::CreateInstance(init_params);

delegate_->set_browser_context(browser_context_.get());

ash::Shell::GetInstance()->CreateShelf();

ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(

« no previous file with comments | « ash/shell.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »