diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 07:55:38 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 07:55:38 +0000 |
| commit | b8984249eaca42461fc3266cc2b1d0057c71c840 (patch) | |
| tree | d194b4a6214f7f2849c61c5197e47dbb7293c31b /ash/shell.cc | |
| parent | 072865b7e912c0962ccbe999bba78f8631e3c730 (diff) | |
| download | chromium_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.cc')
| -rw-r--r-- | ash/shell.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 97450b8..b55cb3f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -16,7 +16,6 @@ #include "ash/display/display_controller.h" #include "ash/display/display_manager.h" #include "ash/display/event_transformation_handler.h" -#include "ash/display/mirror_window_controller.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/display/screen_position_controller.h" #include "ash/drag_drop/drag_drop_controller.h" @@ -214,7 +213,6 @@ Shell::Shell(ShellDelegate* delegate) is_touch_hud_projection_enabled_(false) { DCHECK(delegate_.get()); display_manager_.reset(new internal::DisplayManager); - mirror_window_controller_.reset(new internal::MirrorWindowController); ANNOTATE_LEAKING_OBJECT_PTR(screen_); // see crbug.com/156466 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_); @@ -307,8 +305,6 @@ Shell::~Shell() { power_button_controller_.reset(); lock_state_controller_.reset(); - mirror_window_controller_.reset(); - // This also deletes all RootWindows. Note that we invoke Shutdown() on // DisplayController before resetting |display_controller_|, since destruction // of its owned RootWindowControllers relies on the value. @@ -711,8 +707,10 @@ void Shell::RotateFocus(Direction direction) { void Shell::SetDisplayWorkAreaInsets(Window* contains, const gfx::Insets& insets) { - if (!display_manager_->UpdateWorkAreaOfDisplayNearestWindow(contains, insets)) + if (!display_controller_->UpdateWorkAreaOfDisplayNearestWindow( + contains, insets)) { return; + } FOR_EACH_OBSERVER(ShellObserver, observers_, OnDisplayWorkAreaInsetsChanged()); } |