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

Side by Side Diff: ui/views/animation/ink_drop_animation_controller_factory.cc

Issue 1302913002: Don't try to dllexport InkDropAnimationControllerStub (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/animation/ink_drop_animation_controller_factory.h" 5 #include "ui/views/animation/ink_drop_animation_controller_factory.h"
6 6
7 #include "ui/base/resource/material_design/material_design_controller.h" 7 #include "ui/base/resource/material_design/material_design_controller.h"
8 #include "ui/gfx/geometry/rect.h" 8 #include "ui/gfx/geometry/rect.h"
9 #include "ui/gfx/geometry/size.h" 9 #include "ui/gfx/geometry/size.h"
10 #include "ui/views/animation/ink_drop_animation_controller.h" 10 #include "ui/views/animation/ink_drop_animation_controller.h"
11 #include "ui/views/animation/ink_drop_animation_controller_impl.h" 11 #include "ui/views/animation/ink_drop_animation_controller_impl.h"
12 #include "ui/views/views_export.h" 12 #include "ui/views/views_export.h"
13 13
14 namespace views { 14 namespace views {
15 15
16 namespace { 16 namespace {
17 17
18 // A stub implementation of an InkDropAnimationController that can be used when 18 // A stub implementation of an InkDropAnimationController that can be used when
19 // material design is not enabled. 19 // material design is not enabled.
20 class VIEWS_EXPORT InkDropAnimationControllerStub 20 class InkDropAnimationControllerStub
21 : public InkDropAnimationController { 21 : public InkDropAnimationController {
22 public: 22 public:
23 explicit InkDropAnimationControllerStub(InkDropHost* ink_drop_host); 23 explicit InkDropAnimationControllerStub(InkDropHost* ink_drop_host);
24 ~InkDropAnimationControllerStub() override; 24 ~InkDropAnimationControllerStub() override;
25 25
26 // InkDropAnimationController: 26 // InkDropAnimationController:
27 void AnimateToState(InkDropState state) override; 27 void AnimateToState(InkDropState state) override;
28 void SetInkDropSize(const gfx::Size& size) override; 28 void SetInkDropSize(const gfx::Size& size) override;
29 gfx::Rect GetInkDropBounds() const override; 29 gfx::Rect GetInkDropBounds() const override;
30 void SetInkDropBounds(const gfx::Rect& bounds) override; 30 void SetInkDropBounds(const gfx::Rect& bounds) override;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 return scoped_ptr<InkDropAnimationController>( 73 return scoped_ptr<InkDropAnimationController>(
74 new InkDropAnimationControllerStub(ink_drop_host)); 74 new InkDropAnimationControllerStub(ink_drop_host));
75 } 75 }
76 #endif // defined(OS_CHROMEOS) 76 #endif // defined(OS_CHROMEOS)
77 77
78 return scoped_ptr<InkDropAnimationController>( 78 return scoped_ptr<InkDropAnimationController>(
79 new InkDropAnimationControllerStub(ink_drop_host)); 79 new InkDropAnimationControllerStub(ink_drop_host));
80 } 80 }
81 81
82 } // namespace views 82 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698