ash/shell.cc - Issue 10263011: chromeos: Add support for dimming the screen.

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 10263011: chromeos: Add support for dimming the screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 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: ash/shell.cc

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

index dcf476199773b5092f1c63cf3601845a86b29eb0..3aab8a54b33008cac7312bdc8d7b4f9e86039edb 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -41,6 +41,7 @@

#include "ash/wm/resize_shadow_controller.h"

#include "ash/wm/root_window_event_filter.h"

#include "ash/wm/root_window_layout_manager.h"

+#include "ash/wm/screen_dimmer.h"

#include "ash/wm/shadow_controller.h"

#include "ash/wm/shelf_layout_manager.h"

#include "ash/wm/stacking_controller.h"

@@ -575,6 +576,7 @@ Shell::~Shell() {

drag_drop_controller_.reset();

magnification_controller_.reset();

resize_shadow_controller_.reset();

+ screen_dimmer_.reset();

shadow_controller_.reset();

window_cycle_controller_.reset();

event_client_.reset();

@@ -727,6 +729,7 @@ void Shell::Init() {

video_detector_.reset(new VideoDetector);

window_cycle_controller_.reset(new WindowCycleController);

monitor_controller_.reset(new internal::MonitorController);

+ screen_dimmer_.reset(new internal::ScreenDimmer);

}

aura::Window* Shell::GetContainer(int container_id) {

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