Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: ash/display/multi_display_manager.cc

Issue 11047012: Wiring metro mouse events to aura viewer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/metro_viewer/metro_viewer_process_host_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/multi_display_manager.cc
===================================================================
--- ash/display/multi_display_manager.cc (revision 160403)
+++ 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,15 @@
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 @@
}
#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);
« no previous file with comments | « no previous file | chrome/browser/metro_viewer/metro_viewer_process_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698