diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 21:47:33 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 21:47:33 +0000 |
| commit | 8f05ceaab534c9e0fd354e34b61e70ac48888e2c (patch) | |
| tree | d8430a5bf076b96b6bc087a3d7f457bdef251a76 /ash/display | |
| parent | db84517c5e965d72adb9ce8edaf89a229f3f59fa (diff) | |
| download | chromium_src-8f05ceaab534c9e0fd354e34b61e70ac48888e2c.zip chromium_src-8f05ceaab534c9e0fd354e34b61e70ac48888e2c.tar.gz chromium_src-8f05ceaab534c9e0fd354e34b61e70ac48888e2c.tar.bz2 | |
In-chorme viewer for metro (part 2)
- Wires metro mouse move, mouse click to aura viewer
- Introduces a new RootWindowHost, one that is remote
BUG=151718
TEST=see bug
Review URL: https://codereview.chromium.org/11047012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/multi_display_manager.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/ash/display/multi_display_manager.cc b/ash/display/multi_display_manager.cc index e428c7c..be5897c 100644 --- a/ash/display/multi_display_manager.cc +++ b/ash/display/multi_display_manager.cc @@ -31,6 +31,11 @@ #include "chromeos/display/output_configurator.h" #endif +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#include "ui/aura/remote_root_window_host_win.h" +#endif + DECLARE_WINDOW_PROPERTY_TYPE(int64); typedef std::vector<gfx::Display> DisplayList; @@ -253,8 +258,15 @@ void MultiDisplayManager::OnNativeDisplaysChanged( RootWindow* MultiDisplayManager::CreateRootWindowForDisplay( const gfx::Display& display) { - RootWindow* root_window = - new RootWindow(RootWindow::CreateParams(display.bounds_in_pixel())); + + RootWindow::CreateParams params(display.bounds_in_pixel()); +#if defined(OS_WIN) + if (base::win::GetVersion() >= base::win::VERSION_WIN8) { + params.host = aura::RemoteRootWindowHostWin::Create( + display.bounds_in_pixel()); + } +#endif + aura::RootWindow* root_window = new aura::RootWindow(params); // No need to remove RootWindowObserver because // the DisplayManager object outlives RootWindow objects. root_window->AddRootWindowObserver(this); @@ -358,6 +370,10 @@ void MultiDisplayManager::Init() { } #endif +#if defined(OS_WIN) + if (base::win::GetVersion() >= base::win::VERSION_WIN8) + set_use_fullscreen_host_window(true); +#endif // TODO(oshima): Move this logic to DisplayChangeObserver. const string size_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kAuraHostWindowSize); |