chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 15718003: Add SessionStateObserver with ActiveUserChanged()

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/ui/ash/chrome_shell_delegate.cc

Issue 15718003: Add SessionStateObserver with ActiveUserChanged() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge & add SessionStateDelegateChromeos Created 7 years, 6 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: chrome/browser/ui/ash/chrome_shell_delegate.cc

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc

index dbfa165f8f4437b634533627784f585fac66c322..17416392aad0d7f439e88e0fc9244f80771fcef0 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -29,7 +29,6 @@

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

#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

-#include "chrome/browser/ui/ash/session_state_delegate.h"

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

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

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

@@ -259,10 +258,6 @@ ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate(

return launcher_delegate_;

}

-ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {

- return new SessionStateDelegate;

aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {

return new UserActionHandler;

}