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

Unified Diff: ash/display/root_window_transformers.cc

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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 | « ash/display/root_window_transformers.h ('k') | ash/display/root_window_transformers_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/root_window_transformers.cc
diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc
index a632eb3133f520ee7b68b5403595baa1b11e199c..cba66883ac78b0a30493acc486fca56871d6e21b 100644
--- a/ash/display/root_window_transformers.cc
+++ b/ash/display/root_window_transformers.cc
@@ -8,12 +8,12 @@
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
+#include "ash/host/root_window_transformer.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/shell.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/utils/SkMatrix44.h"
-#include "ui/aura/root_window_transformer.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_property.h"
#include "ui/compositor/dip_util.h"
@@ -123,7 +123,7 @@ gfx::Transform CreateInsetsAndScaleTransform(const gfx::Insets& insets,
}
// RootWindowTransformer for ash environment.
-class AshRootWindowTransformer : public aura::RootWindowTransformer {
+class AshRootWindowTransformer : public RootWindowTransformer {
public:
AshRootWindowTransformer(aura::Window* root,
const gfx::Display& display)
@@ -139,7 +139,6 @@ class AshRootWindowTransformer : public aura::RootWindowTransformer {
CreateRotationTransform(root, display);
transform_ = root_window_bounds_transform_ * CreateMagnifierTransform(root);
CHECK(transform_.GetInverse(&invert_transform_));
-
}
// aura::RootWindowTransformer overrides:
@@ -201,7 +200,7 @@ class AshRootWindowTransformer : public aura::RootWindowTransformer {
// texture (bitmap) of the source display into the mirror window, so
// the root window bounds is the same as the source display's
// pixel size (excluding overscan insets).
-class MirrorRootWindowTransformer : public aura::RootWindowTransformer {
+class MirrorRootWindowTransformer : public RootWindowTransformer {
public:
MirrorRootWindowTransformer(const DisplayInfo& source_display_info,
const DisplayInfo& mirror_display_info) {
@@ -267,13 +266,13 @@ class MirrorRootWindowTransformer : public aura::RootWindowTransformer {
} // namespace
-aura::RootWindowTransformer* CreateRootWindowTransformerForDisplay(
+RootWindowTransformer* CreateRootWindowTransformerForDisplay(
aura::Window* root,
const gfx::Display& display) {
return new AshRootWindowTransformer(root, display);
}
-aura::RootWindowTransformer* CreateRootWindowTransformerForMirroredDisplay(
+RootWindowTransformer* CreateRootWindowTransformerForMirroredDisplay(
const DisplayInfo& source_display_info,
const DisplayInfo& mirror_display_info) {
return new MirrorRootWindowTransformer(source_display_info,
« no previous file with comments | « ash/display/root_window_transformers.h ('k') | ash/display/root_window_transformers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698