diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:08:56 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:08:56 +0000 |
| commit | 29957af3773acac8b16aa37d33d4bde727a32a21 (patch) | |
| tree | 6410e95393f295ca054423e944777dbc4a516e23 /ash/shell.h | |
| parent | 112eb8dba36a81b7a979130a608ec51befd511b5 (diff) | |
| download | chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.zip chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.tar.gz chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.tar.bz2 | |
Move chromeos/display/* to ui/display/chromeos
TBR=darin@chromium.org
BUG=333413
Review URL: https://codereview.chromium.org/192483007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ash/shell.h b/ash/shell.h index 84b33d7..f19645f 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -42,9 +42,6 @@ class ActivationClient; class FocusClient; } } -namespace chromeos { -class OutputConfigurator; -} namespace gfx { class ImageSkia; @@ -58,6 +55,7 @@ class KeyboardController; namespace ui { class Layer; +class OutputConfigurator; } namespace views { class NonClientFrameView; @@ -507,7 +505,7 @@ class ASH_EXPORT Shell #if defined(OS_CHROMEOS) #if defined(USE_X11) // TODO(oshima): Move these objects to DisplayController. - chromeos::OutputConfigurator* output_configurator() { + ui::OutputConfigurator* output_configurator() { return output_configurator_.get(); } internal::OutputConfiguratorAnimation* output_configurator_animation() { @@ -718,7 +716,7 @@ class ASH_EXPORT Shell last_window_closed_logout_reminder_; #if defined(USE_X11) // Controls video output device state. - scoped_ptr<chromeos::OutputConfigurator> output_configurator_; + scoped_ptr<ui::OutputConfigurator> output_configurator_; scoped_ptr<internal::OutputConfiguratorAnimation> output_configurator_animation_; scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; |