ui/views/animation/ink_drop_animation_controller_factory.cc - Issue 1543173002: Switch to standard integer types in ui/views/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

OLD	NEW
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 "base/macros.h"

7 #include "ui/base/resource/material_design/material_design_controller.h"	8 #include "ui/base/resource/material_design/material_design_controller.h"

8 #include "ui/gfx/geometry/rect.h"	9 #include "ui/gfx/geometry/rect.h"

9 #include "ui/gfx/geometry/size.h"	10 #include "ui/gfx/geometry/size.h"

10 #include "ui/views/animation/ink_drop_animation_controller.h"	11 #include "ui/views/animation/ink_drop_animation_controller.h"

11 #include "ui/views/animation/ink_drop_animation_controller_impl.h"	12 #include "ui/views/animation/ink_drop_animation_controller_impl.h"

12 #include "ui/views/views_export.h"	13 #include "ui/views/views_export.h"

13	14

14 namespace views {	15 namespace views {

15	16

16 namespace {	17 namespace {

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 if (ui::MaterialDesignController::IsModeMaterial()) {	72 if (ui::MaterialDesignController::IsModeMaterial()) {

72 return scoped_ptr<InkDropAnimationController>(	73 return scoped_ptr<InkDropAnimationController>(

73 new InkDropAnimationControllerImpl(ink_drop_host));	74 new InkDropAnimationControllerImpl(ink_drop_host));

74 }	75 }

75	76

76 return scoped_ptr<InkDropAnimationController>(	77 return scoped_ptr<InkDropAnimationController>(

77 new InkDropAnimationControllerStub());	78 new InkDropAnimationControllerStub());

78 }	79 }

79	80

80 } // namespace views	81 } // namespace views

OLD	NEW

« no previous file with comments | « ui/views/animation/ink_drop_animation_controller.h ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | ui/views/metrics_aura.cc » ('J')