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

Unified Diff: ash/display/display_manager.cc

Issue 11360045: ash: Add RootWindowHostFactory class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary braces and add missing windows_version.h include. Created 8 years 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 | « ash/ash.gyp ('k') | ash/host/root_window_host_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager.cc
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 572f91aca3eb59a8ea617897c54bdc03b9f0a8d2..476815b2e2b54d0a2e1f19f23344ce24f4ce7221 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "ash/display/display_controller.h"
+#include "ash/host/root_window_host_factory.h"
#include "ash/screen_ash.h"
#include "ash/shell.h"
#include "base/command_line.h"
@@ -320,12 +321,8 @@ void DisplayManager::UpdateDisplays(
RootWindow* DisplayManager::CreateRootWindowForDisplay(
const gfx::Display& display) {
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
+ params.host = Shell::GetInstance()->root_window_host_factory()->
+ CreateRootWindowHost(display.bounds_in_pixel());
aura::RootWindow* root_window = new aura::RootWindow(params);
// No need to remove RootWindowObserver because
// the DisplayManager object outlives RootWindow objects.
« no previous file with comments | « ash/ash.gyp ('k') | ash/host/root_window_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698