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

Side by Side Diff: ash/common/system/tray/throbber_view.cc

Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove
Patch Set: rebase 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
OLDNEW
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/common/system/tray/throbber_view.h"
6 6
7 #include "ash/common/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
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « ash/common/system/tray/throbber_view.h ('k') | ash/common/system/tray/tray_bar_button_with_title.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698