ash/system/tray/throbber_view.cc - Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common

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: ash/system/tray/throbber_view.cc

Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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 | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 "ash/system/tray/throbber_view.h"	5 #include "ash/system/tray/throbber_view.h"

6	6

7 #include "ash/system/tray/tray_constants.h"	7 #include "ash/common/system/tray/tray_constants.h"

8 #include "grit/ash_resources.h"	8 #include "grit/ash_resources.h"

9 #include "ui/base/resource/resource_bundle.h"	9 #include "ui/base/resource/resource_bundle.h"

10 #include "ui/compositor/layer.h"	10 #include "ui/compositor/layer.h"

11 #include "ui/compositor/scoped_layer_animation_settings.h"	11 #include "ui/compositor/scoped_layer_animation_settings.h"

12	12

13 namespace ash {	13 namespace ash {

14 namespace {	14 namespace {

15	15

16 // Duration for showing/hiding animation in milliseconds.	16 // Duration for showing/hiding animation in milliseconds.

17 const int kThrobberAnimationDurationMs = 200;	17 const int kThrobberAnimationDurationMs = 200;

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 layer()->GetAnimator()->StopAnimating();	92 layer()->GetAnimator()->StopAnimating();

93	93

94 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());	94 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());

95 animation.SetTransitionDuration(	95 animation.SetTransitionDuration(

96 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs));	96 base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs));

97	97

98 layer()->SetOpacity(start_throbber ? 1.0 : 0.0);	98 layer()->SetOpacity(start_throbber ? 1.0 : 0.0);

99 }	99 }

100	100

101 } // namespace ash	101 } // namespace ash

OLD	NEW