chrome/browser/chromeos/login/signin/merge_session_load_page.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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/browser/chromeos/login/signin/merge_session_load_page.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/login/lock/webui_screen_locker.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_load_page.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

index dcb418508c660b30326faaf30c3ccbdad30d94e9..9dd463773943a4b25c97876e32cc0787e95cc524 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

@@ -4,9 +4,6 @@

#include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"

-#include "ash/common/system/tray/system_tray_delegate.h"

-#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "base/metrics/histogram.h"

#include "base/strings/string_piece.h"

#include "base/strings/stringprintf.h"