diff options
| author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 04:13:30 +0000 |
|---|---|---|
| committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 04:13:30 +0000 |
| commit | fca90ea83b9eb992c8753544c91696344d345ff0 (patch) | |
| tree | a33966779edba19bac12eb8c6798c6f577cff4b4 /ash/shell.cc | |
| parent | ae1134914df8824d2c4af4efc0f1711dfe27eb76 (diff) | |
| download | chromium_src-fca90ea83b9eb992c8753544c91696344d345ff0.zip chromium_src-fca90ea83b9eb992c8753544c91696344d345ff0.tar.gz chromium_src-fca90ea83b9eb992c8753544c91696344d345ff0.tar.bz2 | |
ash: Add RootWindowHostFactory class.
This provides a mechanism for creating a RootWindowHost to use in place
of the default one that aura::RootWindow will create. This is exposed
to consumers of ash through the addition of the CreateRootWindowHostFactory
function to the ShellDelegate interface.
BUG=124444
TEST=ash_unittests
Review URL: https://chromiumcodereview.appspot.com/11360045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 0d4461c..8050414 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -20,6 +20,7 @@ #include "ash/drag_drop/drag_drop_controller.h" #include "ash/focus_cycler.h" #include "ash/high_contrast/high_contrast_controller.h" +#include "ash/host/root_window_host_factory.h" #include "ash/launcher/launcher_delegate.h" #include "ash/launcher/launcher_model.h" #include "ash/magnifier/magnification_controller.h" @@ -427,6 +428,7 @@ void Shell::Init() { focus_cycler_.reset(new internal::FocusCycler()); screen_position_controller_.reset(new internal::ScreenPositionController); + root_window_host_factory_.reset(delegate_->CreateRootWindowHostFactory()); display_controller_.reset(new DisplayController); display_controller_->InitPrimaryDisplay(); aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow(); |