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

Unified Diff: ui/views/animation/ink_drop_animation_controller_factory.cc

Issue 1937353002: Rename of InkDropAnimationController classes to InkDrop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed tdanderson@ comments from patch set 2. Created 4 years, 7 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: ui/views/animation/ink_drop_animation_controller_factory.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_factory.cc b/ui/views/animation/ink_drop_animation_controller_factory.cc
deleted file mode 100644
index 17bc202a48343f7b4a3b85c342a82539d009c208..0000000000000000000000000000000000000000
--- a/ui/views/animation/ink_drop_animation_controller_factory.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 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 "ui/views/animation/ink_drop_animation_controller_factory.h"
-
-#include "base/macros.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/views/animation/ink_drop_animation_controller.h"
-#include "ui/views/animation/ink_drop_animation_controller_impl.h"
-#include "ui/views/views_export.h"
-
-namespace views {
-
-namespace {
-
-// A stub implementation of an InkDropAnimationController that can be used when
-// material design is not enabled.
-class InkDropAnimationControllerStub
- : public InkDropAnimationController {
- public:
- explicit InkDropAnimationControllerStub();
- ~InkDropAnimationControllerStub() override;
-
- // InkDropAnimationController:
- InkDropState GetTargetInkDropState() const override;
- bool IsVisible() const override;
- void AnimateToState(InkDropState state) override;
- void SnapToActivated() override;
- void SetHovered(bool is_hovered) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerStub);
-};
-
-InkDropAnimationControllerStub::InkDropAnimationControllerStub() {}
-
-InkDropAnimationControllerStub::~InkDropAnimationControllerStub() {}
-
-InkDropState InkDropAnimationControllerStub::GetTargetInkDropState() const {
- return InkDropState::HIDDEN;
-}
-
-bool InkDropAnimationControllerStub::IsVisible() const {
- return false;
-}
-
-void InkDropAnimationControllerStub::AnimateToState(InkDropState state) {}
-
-void InkDropAnimationControllerStub::SnapToActivated() {}
-
-void InkDropAnimationControllerStub::SetHovered(bool is_hovered) {}
-
-} // namespace
-
-InkDropAnimationControllerFactory::InkDropAnimationControllerFactory() {}
-
-InkDropAnimationControllerFactory::~InkDropAnimationControllerFactory() {}
-
-std::unique_ptr<InkDropAnimationController>
-InkDropAnimationControllerFactory::CreateInkDropAnimationController(
- InkDropHost* ink_drop_host) {
- if (ui::MaterialDesignController::IsModeMaterial()) {
- return std::unique_ptr<InkDropAnimationController>(
- new InkDropAnimationControllerImpl(ink_drop_host));
- }
-
- return std::unique_ptr<InkDropAnimationController>(
- new InkDropAnimationControllerStub());
-}
-
-} // namespace views

Powered by Google App Engine
This is Rietveld 408576698