ash/wm/power_button_controller.h - Issue 2613493002: Fix namespace for src/ui/display/.

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/wm/power_button_controller.h

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)

Patch Set: Rebase. Created 3 years, 11 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/wm/power_button_controller.h

diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h

index 77fe50523365f4b2ac3305c56c138b9a559fe7ba..9f8dfef0557e6b1cf40fe4479ac88612e606a4e1 100644

--- a/ash/wm/power_button_controller.h

+++ b/ash/wm/power_button_controller.h

@@ -33,7 +33,7 @@ class ASH_EXPORT PowerButtonController

// cross-platform.

#if defined(OS_CHROMEOS)

- public ui::DisplayConfigurator::Observer,

+ public display::DisplayConfigurator::Observer,

public chromeos::PowerManagerClient::Observer

#endif

{

@@ -56,9 +56,9 @@ class ASH_EXPORT PowerButtonController

void OnKeyEvent(ui::KeyEvent* event) override;

#if defined(OS_CHROMEOS)

- // Overriden from ui::DisplayConfigurator::Observer:

+ // Overriden from display::DisplayConfigurator::Observer:

void OnDisplayModeChanged(

- const ui::DisplayConfigurator::DisplayStateList& outputs) override;

+ const display::DisplayConfigurator::DisplayStateList& outputs) override;

// Overridden from chromeos::PowerManagerClient::Observer:

void PowerButtonEventReceived(bool down,

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