trunk/src/ash/shell/window_type_launcher.cc - Issue 14200034: Revert 194578 "Add ash SessionStateDelegate"

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: trunk/src/ash/shell/window_type_launcher.cc

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 8 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: trunk/src/ash/shell/window_type_launcher.cc

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

--- trunk/src/ash/shell/window_type_launcher.cc (revision 194588)

+++ trunk/src/ash/shell/window_type_launcher.cc (working copy)

@@ -6,12 +6,12 @@

#include "ash/root_window_controller.h"

#include "ash/screensaver/screensaver_view.h"

-#include "ash/session_state_delegate.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/shell/example_factory.h"

#include "ash/shell/panel_window.h"

#include "ash/shell/toplevel_window.h"

+#include "ash/shell_delegate.h"

#include "ash/shell_window_ids.h"

#include "ash/system/status_area_widget.h"

#include "ash/system/web_notification/web_notification_tray.h"

@@ -336,7 +336,7 @@

} else if (sender == bubble_button_) {

CreatePointyBubble(sender);

} else if (sender == lock_button_) {

- Shell::GetInstance()->session_state_delegate()->LockScreen();

+ Shell::GetInstance()->delegate()->LockScreen();

} else if (sender == widgets_button_) {

CreateWidgetsWindow();

} else if (sender == system_modal_button_) {

« no previous file with comments | « trunk/src/ash/shell/shell_delegate_impl.cc ('k') | trunk/src/ash/shell_delegate.h » ('j') | no next file with comments »