ash/shell.cc - Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller.

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.cc

Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

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

--- ash/shell.cc (revision 162199)

+++ ash/shell.cc (working copy)

@@ -46,7 +46,6 @@

#include "ash/wm/resize_shadow_controller.h"

#include "ash/wm/root_window_layout_manager.h"

#include "ash/wm/screen_dimmer.h"

-#include "ash/wm/session_state_controller.h"

#include "ash/wm/shadow_controller.h"

#include "ash/wm/stacking_controller.h"

#include "ash/wm/system_gesture_event_filter.h"

@@ -248,7 +247,6 @@

drag_drop_controller_.reset();

magnification_controller_.reset();

power_button_controller_.reset();

- session_state_controller_.reset();

resize_shadow_controller_.reset();

shadow_controller_.reset();

tooltip_controller_.reset();

@@ -490,10 +488,8 @@

// the correct size.

user_wallpaper_delegate_->InitializeWallpaper();

- session_state_controller_.reset(new SessionStateController);

- power_button_controller_.reset(new PowerButtonController(

- session_state_controller_.get()));

- AddShellObserver(session_state_controller_.get());

+ power_button_controller_.reset(new PowerButtonController);

+ AddShellObserver(power_button_controller_.get());

if (initially_hide_cursor_)

cursor_manager_.ShowCursor(false);

« no previous file with comments | « ash/shell.h ('k') | ash/wm/power_button_controller.h » ('j') | no next file with comments »