summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-12 07:55:38 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-12 07:55:38 +0000
commitb8984249eaca42461fc3266cc2b1d0057c71c840 (patch)
treed194b4a6214f7f2849c61c5197e47dbb7293c31b /ash/shell.h
parent072865b7e912c0962ccbe999bba78f8631e3c730 (diff)
downloadchromium_src-b8984249eaca42461fc3266cc2b1d0057c71c840.zip
chromium_src-b8984249eaca42461fc3266cc2b1d0057c71c840.tar.gz
chromium_src-b8984249eaca42461fc3266cc2b1d0057c71c840.tar.bz2
[Cleanup]
* Remove aura from DisplayManager -Introduced DislayManager::Delegate to decouple DisplayController - Moved methods that requires aura to DisplayController - Changed to use DisplayInfo to get native bounds instead of RootWindow. * Moved mirror_window_controller_ from Shell to DisplayControlller. This should belong to DC rather than Shell. BUG=253991 Review URL: https://chromiumcodereview.appspot.com/19038002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/shell.h b/ash/shell.h
index a602cdf..69b8970e 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -111,7 +111,6 @@ class EventClientImpl;
class EventRewriterEventFilter;
class EventTransformationHandler;
class FocusCycler;
-class MirrorWindowController;
class MouseCursorEventFilter;
class OutputConfiguratorAnimation;
class OverlayEventFilter;
@@ -287,9 +286,6 @@ class ASH_EXPORT Shell
internal::DisplayManager* display_manager() {
return display_manager_.get();
}
- internal::MirrorWindowController* mirror_window_controller() {
- return mirror_window_controller_.get();
- }
views::corewm::InputMethodEventFilter* input_method_filter() {
return input_method_filter_.get();
}
@@ -586,7 +582,6 @@ class ASH_EXPORT Shell
scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
scoped_ptr<internal::DisplayManager> display_manager_;
- scoped_ptr<internal::MirrorWindowController> mirror_window_controller_;
#if defined(OS_CHROMEOS) && defined(USE_X11)
// Controls video output device state.