ash/system/chromeos/network/network_icon_animation.cc - Issue 12186029: Merge 180012

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/chromeos/network/network_icon_animation.cc

Issue 12186029: Merge 180012 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

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

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/chromeos/network/network_icon_animation.h"	5 #include "ash/system/chromeos/network/network_icon_animation.h"

6	6

7 #include "ash/system/chromeos/network/network_icon_animation_observer.h"	7 #include "ash/system/chromeos/network/network_icon_animation_observer.h"

8	8

9 namespace {	9 namespace {

10 const int kThrobDurationMs = 750; // Animation cycle length.	10 const int kThrobDurationMs = 750; // Animation cycle length.

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50	50

51 // static	51 // static

52 NetworkIconAnimation* NetworkIconAnimation::GetInstance() {	52 NetworkIconAnimation* NetworkIconAnimation::GetInstance() {

53 static NetworkIconAnimation* s_icon_animation =	53 static NetworkIconAnimation* s_icon_animation =

54 new NetworkIconAnimation();	54 new NetworkIconAnimation();

55 return s_icon_animation;	55 return s_icon_animation;

56 }	56 }

57	57

58 } // namespace network_icon	58 } // namespace network_icon

59 } // namespace ash	59 } // namespace ash

OLD	NEW