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

Unified Diff: ash/common/system/chromeos/network/network_icon_animation.h

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: Rebase Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/system/chromeos/network/network_icon_animation.h
diff --git a/ui/chromeos/network/network_icon_animation.h b/ash/common/system/chromeos/network/network_icon_animation.h
similarity index 76%
rename from ui/chromeos/network/network_icon_animation.h
rename to ash/common/system/chromeos/network/network_icon_animation.h
index f37791b790aa5fa3aab3e121598bbd9f49cbedc7..0f28eb4e42c63c054d17d938a20ce568c874a7e0 100644
--- a/ui/chromeos/network/network_icon_animation.h
+++ b/ash/common/system/chromeos/network/network_icon_animation.h
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
-#define UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
#include <set>
#include <string>
+#include "ash/ash_export.h"
#include "base/observer_list.h"
-#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/animation/throb_animation.h"
-namespace ui {
+namespace ash {
namespace network_icon {
class AnimationObserver;
// Single instance class to handle icon animations and keep them in sync.
-class UI_CHROMEOS_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate {
+class ASH_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate {
public:
NetworkIconAnimation();
~NetworkIconAnimation() override;
@@ -43,6 +43,6 @@ class UI_CHROMEOS_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate {
};
} // namespace network_icon
-} // namespace ui
+} // namespace ash
-#endif // UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
« no previous file with comments | « ash/common/system/chromeos/network/network_icon.cc ('k') | ash/common/system/chromeos/network/network_icon_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698