Chromium Code Reviews| Index: ash/display/multi_display_manager.cc |
| =================================================================== |
| --- ash/display/multi_display_manager.cc (revision 159567) |
| +++ ash/display/multi_display_manager.cc (working copy) |
| @@ -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,18 @@ |
| RootWindow* MultiDisplayManager::CreateRootWindowForDisplay( |
| const gfx::Display& display) { |
| - RootWindow* root_window = |
| - new RootWindow(RootWindow::CreateParams(display.bounds_in_pixel())); |
| + |
| + RootWindow* root_window = NULL; |
| +#if defined(OS_WIN) |
| + if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
| + root_window = aura::RemoteRootWindowHostWin::CreateRootWindow( |
| + display.bounds_in_pixel()); |
| + } |
| +#endif |
| + if (!root_window) { |
| + root_window = new RootWindow( |
| + RootWindow::CreateParams(display.bounds_in_pixel())); |
| + } |
|
Ben Goodger (Google)
2012/10/04 15:48:30
Write this like so:
RootWindow::CreateParams pa
cpu_(ooo_6.6-7.5)
2012/10/04 19:57:56
The problem is that I need to update the delegate_
|
| // No need to remove RootWindowObserver because |
| // the DisplayManager object outlives RootWindow objects. |
| root_window->AddRootWindowObserver(this); |
| @@ -358,6 +373,10 @@ |
| } |
| #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); |