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

Unified Diff: wm/host/root_window_host_factory.cc

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Push gfx::AcceleratedWidget usage into platform specific code. Created 7 years, 10 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 | « wm/host/root_window_host_factory.h ('k') | wm/host/root_window_host_factory_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: wm/host/root_window_host_factory.cc
diff --git a/ash/host/root_window_host_factory.cc b/wm/host/root_window_host_factory.cc
similarity index 50%
copy from ash/host/root_window_host_factory.cc
copy to wm/host/root_window_host_factory.cc
index a0dbc0e59069c95814d311b2986fb211111f680e..d36a8aafdda76fdf00951faa442533aa1f0d6d1a 100644
--- a/ash/host/root_window_host_factory.cc
+++ b/wm/host/root_window_host_factory.cc
@@ -1,31 +1,35 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/host/root_window_host_factory.h"
+#include "wm/host/root_window_host_factory.h"
#include "ui/aura/root_window_host.h"
+namespace wm {
+
namespace {
-class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory {
+class RootWindowHostFactoryImpl : public RootWindowHostFactory {
public:
- RootWindowHostFactoryImpl() {}
+ RootWindowHostFactoryImpl() {
+ impl_.reset(ash::RootWindowHostFactory::Create());
+ }
// Overridden from RootWindowHostFactory:
virtual aura::RootWindowHost* CreateRootWindowHost(
const gfx::Rect& initial_bounds) OVERRIDE {
- return aura::RootWindowHost::Create(initial_bounds);
+ return impl_->CreateRootWindowHost(initial_bounds);
}
-};
-}
+ scoped_ptr<ash::RootWindowHostFactory> impl_;
+};
-namespace ash {
+} // namespace
// static
RootWindowHostFactory* RootWindowHostFactory::Create() {
return new RootWindowHostFactoryImpl;
}
-} // namespace ash
+} // namespace wm
« no previous file with comments | « wm/host/root_window_host_factory.h ('k') | wm/host/root_window_host_factory_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698