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

Unified Diff: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with parent patch Created 9 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
Index: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
index ed4aea7cbfd6f5e8229815d68f66eaba436be818..dc3beeefd0e3f10568a51cb65fffb7729fda0170 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h"
-#include "chrome/browser/ui/touch/animation/screen_rotation_setter.h"
+#include "chrome/browser/ui/touch/animation/screen_rotation_animator.h"
#include "views/controls/button/image_button.h"
#include "views/desktop/desktop_window_view.h"
+#include "ui/gfx/compositor/layer.h"
#include "ui/gfx/transform.h"
namespace {
@@ -101,9 +102,11 @@ void TouchBrowserFrameView::OnScreenOrientationChanged(
if (!initialized_screen_rotation_) {
to_rotate->SetPaintToLayer(true);
- to_rotate->SetLayerPropertySetter(
- ScreenRotationSetterFactory::Create(to_rotate));
- initialized_screen_rotation_ = true;
+ if (to_rotate->layer()) {
+ to_rotate->layer()->SetAnimator(
+ ScreenRotationAnimatorFactory::Create(to_rotate));
+ initialized_screen_rotation_ = true;
+ }
}
const ui::Transform& old_xform = to_rotate->GetTransform();

Powered by Google App Engine
This is Rietveld 408576698